@alephium/web3 0.2.0-test.0 → 0.2.0-test.1

package/dist/src/global.d.ts

@@ -0,0 +1,3 @@
+import { NodeProvider } from './api';
+export declare function setCurrentNodeProvider(provider: NodeProvider | string): void;
+export declare function getCurrentNodeProvider(): NodeProvider;

package/dist/src/global.js

@@ -0,0 +1,38 @@
+"use strict";
+/*
+Copyright 2018 - 2022 The Alephium Authors
+This file is part of the alephium project.
+
+The library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+The library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU Lesser General Public License for more details.
+
+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/>.
+*/
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCurrentNodeProvider = exports.setCurrentNodeProvider = void 0;
+const api_1 = require("./api");
+let _currentNodeProvider = undefined;
+function setCurrentNodeProvider(provider) {
+    if (typeof provider == 'string') {
+        _currentNodeProvider = new api_1.NodeProvider(provider);
+    }
+    else {
+        _currentNodeProvider = provider;
+    }
+}
+exports.setCurrentNodeProvider = setCurrentNodeProvider;
+function getCurrentNodeProvider() {
+    if (typeof _currentNodeProvider === 'undefined') {
+        throw Error('No node provider is set.');
+    }
+    return _currentNodeProvider;
+}
+exports.getCurrentNodeProvider = getCurrentNodeProvider;

package/dist/src/index.d.ts

@@ -4,3 +4,4 @@ export * from './signer';
 export * from './utils';
 export * from './transaction';
 export * from './constants';
+export * from './global';

package/dist/src/index.js

@@ -33,3 +33,4 @@ __exportStar(require("./signer"), exports);
 __exportStar(require("./utils"), exports);
 __exportStar(require("./transaction"), exports);
 __exportStar(require("./constants"), exports);
+__exportStar(require("./global"), exports);

package/dist/src/signer/node-wallet.d.ts

@@ -1,12 +1,10 @@
-import { NodeProvider } from '../api';
 import { Account, SignerWithNodeProvider } from '../signer';
 export declare class NodeWallet extends SignerWithNodeProvider {
     walletName: string;
     accounts: Account[] | undefined;
-    constructor(provider: NodeProvider, walletName: string, alwaysSubmitTx?: boolean);
+    constructor(walletName: string, alwaysSubmitTx?: boolean);
     getAccounts(): Promise<Account[]>;
     private getAllAccounts;
-    static FromCliqueClient(provider: NodeProvider, walletName: string, alwaysSubmitTx?: boolean): Promise<NodeWallet>;
     signRaw(signerAddress: string, hexString: string): Promise<string>;
     unlock(password: string): Promise<void>;
     lock(): Promise<void>;

package/dist/src/signer/node-wallet.js

@@ -20,8 +20,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeWallet = void 0;
 const signer_1 = require("../signer");
 class NodeWallet extends signer_1.SignerWithNodeProvider {
-    constructor(provider, walletName, alwaysSubmitTx = true) {
-        super(provider, alwaysSubmitTx);
+    constructor(walletName, alwaysSubmitTx = true) {
+        super(alwaysSubmitTx);
         this.walletName = walletName;
     }
     async getAccounts() {
@@ -39,9 +39,6 @@ class NodeWallet extends signer_1.SignerWithNodeProvider {
         }));
         return accounts;
     }
-    static async FromCliqueClient(provider, walletName, alwaysSubmitTx = true) {
-        return new NodeWallet(provider, walletName, alwaysSubmitTx);
-    }
     async signRaw(signerAddress, hexString) {
         const currentActiveAddressResponse = await this.provider.wallets.getWalletsWalletNameAddresses(this.walletName);
         const { activeAddress } = currentActiveAddressResponse;

package/dist/src/signer/signer.d.ts

@@ -111,7 +111,7 @@ export declare abstract class SignerWithNodeProvider implements SignerProvider {
     alwaysSubmitTx: boolean;
     abstract getAccounts(): Promise<Account[]>;
     getAccount(signerAddress: string): Promise<Account>;
-    constructor(provider: NodeProvider, alwaysSubmitTx: boolean);
+    constructor(alwaysSubmitTx: boolean);
     private defaultSignerAddress;
     submitTransaction(unsignedTx: string, txHash: string, signerAddress?: string): Promise<SubmissionResult>;
     private shouldSubmitTx;

package/dist/src/signer/signer.js

@@ -44,6 +44,7 @@ const elliptic_1 = require("elliptic");
 const utils = __importStar(require("../utils"));
 const utils_1 = require("../utils");
 const blakejs_1 = __importDefault(require("blakejs"));
+const global_1 = require("../global");
 const ec = new elliptic_1.ec('secp256k1');
 (0, utils_1.assertType)();
 (0, utils_1.assertType)();
@@ -58,8 +59,8 @@ const ec = new elliptic_1.ec('secp256k1');
 (0, utils_1.assertType)();
 (0, utils_1.assertType)();
 class SignerWithNodeProvider {
-    constructor(provider, alwaysSubmitTx) {
-        this.provider = provider;
+    constructor(alwaysSubmitTx) {
+        this.provider = (0, global_1.getCurrentNodeProvider)();
         this.alwaysSubmitTx = alwaysSubmitTx;
     }
     async getAccount(signerAddress) {

package/dist/src/test/index.d.ts

@@ -1,7 +1,6 @@
-import { NodeProvider } from '../api';
 import { NodeWallet } from '../signer';
 export declare const testWalletName = "alephium-web3-test-only-wallet";
 export declare const testAddress = "1DrDyTr9RpRsQnDnXo2YRiPzPW4ooHX5LLoqXrqfMrpQH";
 export declare const testPassword = "alph";
-export declare function testWallet(provider: NodeProvider): Promise<NodeWallet>;
+export declare function testNodeWallet(): Promise<NodeWallet>;
 export * from './privatekey-wallet';

package/dist/src/test/index.js

@@ -27,15 +27,15 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.testWallet = exports.testPassword = exports.testAddress = exports.testWalletName = void 0;
+exports.testNodeWallet = exports.testPassword = exports.testAddress = exports.testWalletName = void 0;
 const signer_1 = require("../signer");
 exports.testWalletName = 'alephium-web3-test-only-wallet';
 exports.testAddress = '1DrDyTr9RpRsQnDnXo2YRiPzPW4ooHX5LLoqXrqfMrpQH';
 exports.testPassword = 'alph';
-async function testWallet(provider) {
-    const wallet = new signer_1.NodeWallet(provider, exports.testWalletName);
+async function testNodeWallet() {
+    const wallet = new signer_1.NodeWallet(exports.testWalletName);
     await wallet.unlock(exports.testPassword);
     return wallet;
 }
-exports.testWallet = testWallet;
+exports.testNodeWallet = testNodeWallet;
 __exportStar(require("./privatekey-wallet"), exports);

package/dist/src/test/privatekey-wallet.d.ts

@@ -1,12 +1,11 @@
-import { NodeProvider } from '../api';
 import { Account, SignerWithNodeProvider } from '../signer';
 export declare class PrivateKeyWallet extends SignerWithNodeProvider {
     readonly privateKey: string;
     readonly publicKey: string;
     readonly address: string;
     readonly group: number;
-    constructor(provider: NodeProvider, privateKey: string, alwaysSubmitTx?: boolean);
-    static Random(provider: NodeProvider, alwaysSubmitTx?: boolean): PrivateKeyWallet;
+    constructor(privateKey: string, alwaysSubmitTx?: boolean);
+    static Random(alwaysSubmitTx?: boolean): PrivateKeyWallet;
     getAccounts(): Promise<Account[]>;
     signRaw(signerAddress: string, hexString: string): Promise<string>;
 }

package/dist/src/test/privatekey-wallet.js

@@ -42,16 +42,16 @@ const signer_1 = require("../signer");
 const utils = __importStar(require("../utils"));
 const ec = new elliptic_1.ec('secp256k1');
 class PrivateKeyWallet extends signer_1.SignerWithNodeProvider {
-    constructor(provider, privateKey, alwaysSubmitTx = true) {
-        super(provider, alwaysSubmitTx);
+    constructor(privateKey, alwaysSubmitTx = true) {
+        super(alwaysSubmitTx);
         this.privateKey = privateKey;
         this.publicKey = utils.publicKeyFromPrivateKey(privateKey);
         this.address = utils.addressFromPublicKey(this.publicKey);
         this.group = utils.groupOfAddress(this.address);
     }
-    static Random(provider, alwaysSubmitTx = true) {
+    static Random(alwaysSubmitTx = true) {
         const keyPair = ec.genKeyPair();
-        return new PrivateKeyWallet(provider, keyPair.getPrivate().toString('hex'), alwaysSubmitTx);
+        return new PrivateKeyWallet(keyPair.getPrivate().toString('hex'), alwaysSubmitTx);
     }
     async getAccounts() {
         return [{ address: this.address, publicKey: this.publicKey, group: this.group }];

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

@@ -3,7 +3,6 @@ import { NodeProvider } from '../api';
 declare type MessageCallback<Message> = (message: Message) => Promise<void>;
 declare type ErrorCallback<Message> = (error: any, subscription: Subscription<Message>) => Promise<void>;
 export interface SubscribeOptions<Message> {
-    provider: NodeProvider;
     pollingInterval: number;
     messageCallback: MessageCallback<Message>;
     errorCallback: ErrorCallback<Message>;

package/dist/src/utils/subscription.js

@@ -22,9 +22,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Subscription = void 0;
 const eventemitter3_1 = __importDefault(require("eventemitter3"));
+const global_1 = require("../global");
 class Subscription {
     constructor(options) {
-        this.provider = options.provider;
+        this.provider = (0, global_1.getCurrentNodeProvider)();
         this.pollingInterval = options.pollingInterval;
         this.messageCallback = options.messageCallback;
         this.errorCallback = options.errorCallback;

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

@@ -20,8 +20,8 @@ export declare function addressFromContractId(contractId: string): string;
 export declare function contractIdFromTx(txId: string, outputIndex: number): string;
 export declare function subContractId(parentContractId: string, pathInHex: string): string;
 export declare function stringToHex(str: string): string;
-export declare function hexToString(str: any): string;
-export declare function timeout(ms: number): Promise<unknown>;
+export declare function hexToString(str: string): string;
+export declare function timeout(ms: number): Promise<void>;
 declare type _Eq<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;
 export declare type Eq<X, Y> = _Eq<{
     [P in keyof X]: X[P];

package/dist/src/utils/utils.js

@@ -182,7 +182,7 @@ function contractIdFromTx(txId, outputIndex) {
 }
 exports.contractIdFromTx = contractIdFromTx;
 function subContractId(parentContractId, pathInHex) {
-    const data = buffer_1.Buffer.concat([hexToBinUnsafe(pathInHex), hexToBinUnsafe(parentContractId)]);
+    const data = buffer_1.Buffer.concat([hexToBinUnsafe(parentContractId), hexToBinUnsafe(pathInHex)]);
     return binToHex(blakejs_1.default.blake2b(blakejs_1.default.blake2b(data, undefined, 32), undefined, 32));
 }
 exports.subContractId = subContractId;
@@ -195,7 +195,7 @@ function stringToHex(str) {
 }
 exports.stringToHex = stringToHex;
 function hexToString(str) {
-    return buffer_1.Buffer.from(str.toString(), 'hex').toString();
+    return buffer_1.Buffer.from(str, 'hex').toString();
 }
 exports.hexToString = hexToString;
 function timeout(ms) {

package/gitignore

@@ -7,4 +7,3 @@ web/
 coverage/
 /dev/
 !dev/user.conf
-/artifacts/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.2.0-test.0",
+  "version": "0.2.0-test.1",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",
@@ -27,8 +27,8 @@
   },
   "author": "Alephium dev <dev@alephium.org>",
   "config": {
-    "alephium_version": "1.4.2",
-    "explorer_backend_version": "1.7.0"
+    "alephium_version": "1.5.0-rc6",
+    "explorer_backend_version": "1.7.1"
   },
   "scripts": {
     "build": "rm -rf dist/* && npx tsc --build . && webpack",
@@ -88,7 +88,6 @@
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-header": "^3.1.1",
     "eslint-plugin-prettier": "^4.0.0",
-    "eslint-plugin-react": "^7.29.4",
     "eslint-plugin-security": "1.4.0",
     "html-webpack-plugin": "5.5.0",
     "jest": "^28.1.0",
@@ -98,7 +97,6 @@
     "mock-socket": "^9.0.8",
     "prettier": "^2.3.2",
     "process": "^0.11.10",
-    "react-app-rewired": "^2.2.1",
     "rewire": "^6.0.0",
     "shelljs": "^0.8.5",
     "stream-browserify": "^3.0.0",

package/scripts/create-project.ts

@@ -87,7 +87,8 @@ function prepareShared(packageRoot: string, projectRoot: string) {
 
 function prepareBase(packageRoot: string, projectRoot: string) {
   prepareShared(packageRoot, projectRoot)
-  copy('contracts', ['greeter.ral', 'greeter_interface.ral', 'greeter_main.ral'])
+  copy('contracts', ['greeter_main.ral'])
+  copy('contracts/greeter', ['greeter.ral', 'greeter_interface.ral'])
   fsExtra.copySync(path.join(packageRoot, 'templates/base'), projectRoot)
 }
 

package/src/api/api-alephium.ts

@@ -207,6 +207,9 @@ export interface BuildDeployContractTx {
 
   /** @format uint256 */
   gasPrice?: string
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface BuildDeployContractTxResult {
@@ -246,6 +249,9 @@ export interface BuildExecuteScriptTx {
 
   /** @format uint256 */
   gasPrice?: string
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface BuildExecuteScriptTxResult {
@@ -311,6 +317,9 @@ export interface BuildSweepAddressTransactions {
 
   /** @format uint256 */
   gasPrice?: string
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface BuildSweepAddressTransactionsResult {
@@ -334,6 +343,9 @@ export interface BuildTransaction {
 
   /** @format uint256 */
   gasPrice?: string
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface BuildTransactionResult {
@@ -417,12 +429,19 @@ export interface CompileContractResult {
   fields: FieldsSig
   functions: FunctionSig[]
   events: EventSig[]
+  warnings: string[]
+}
+
+export interface CompileProjectResult {
+  contracts: CompileContractResult[]
+  scripts: CompileScriptResult[]
 }
 
 export interface CompileScriptResult {
   bytecodeTemplate: string
   fields: FieldsSig
   functions: FunctionSig[]
+  warnings: string[]
 }
 
 export interface Confirmed {
@@ -549,7 +568,6 @@ export type DiscoveryAction = Reachable | Unreachable
 
 export interface EventSig {
   name: string
-  signature: string
   fieldNames: string[]
   fieldTypes: string[]
 }
@@ -559,9 +577,9 @@ export interface FetchResponse {
 }
 
 export interface FieldsSig {
-  signature: string
   names: string[]
   types: string[]
+  isMutable: boolean[]
 }
 
 export interface FixedAssetOutput {
@@ -587,9 +605,12 @@ export interface FixedAssetOutput {
 
 export interface FunctionSig {
   name: string
-  signature: string
-  argNames: string[]
-  argTypes: string[]
+  usePreapprovedAssets: boolean
+  useAssetsInContract: boolean
+  isPublic: boolean
+  paramNames: string[]
+  paramTypes: string[]
+  paramIsMutable: boolean[]
   returnTypes: string[]
 }
 
@@ -691,6 +712,10 @@ export interface Penalty {
   type: string
 }
 
+export interface Project {
+  code: string
+}
+
 export interface Reachable {
   peers: string[]
   type: string
@@ -778,6 +803,9 @@ export interface Sweep {
 
   /** @format int32 */
   utxosLimit?: number
+
+  /** @format block-hash */
+  targetBlockHash?: string
 }
 
 export interface SweepAddressTransaction {
@@ -1099,7 +1127,7 @@ export enum ContentType {
 }
 
 export class HttpClient<SecurityDataType = unknown> {
-  public baseUrl: string = '{protocol}://{host}:{port}'
+  public baseUrl: string = '../'
   private securityData: SecurityDataType | null = null
   private securityWorker?: ApiConfig<SecurityDataType>['securityWorker']
   private abortControllers = new Map<CancelToken, AbortController>()
@@ -1264,8 +1292,8 @@ export class HttpClient<SecurityDataType = unknown> {
 
 /**
  * @title Alephium API
- * @version 1.4.2
- * @baseUrl {protocol}://{host}:{port}
+ * @version 1.5.0
+ * @baseUrl ../
  */
 export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDataType> {
   wallets = {
@@ -2145,6 +2173,27 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         ...params
       }).then(convertHttpResponse),
 
+    /**
+     * No description
+     *
+     * @tags Contracts
+     * @name PostContractsCompileProject
+     * @summary Compile a project
+     * @request POST:/contracts/compile-project
+     */
+    postContractsCompileProject: (data: Project, params: RequestParams = {}) =>
+      this.request<
+        CompileProjectResult,
+        BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable
+      >({
+        path: `/contracts/compile-project`,
+        method: 'POST',
+        body: data,
+        type: ContentType.Json,
+        format: 'json',
+        ...params
+      }).then(convertHttpResponse),
+
     /**
      * No description
      *

package/src/api/api-explorer.ts

@@ -847,6 +847,36 @@ export class Api<SecurityDataType extends unknown> extends HttpClient<SecurityDa
         path: `/utils/sanity-check`,
         method: 'PUT',
         ...params
+      }).then(convertHttpResponse),
+
+    /**
+     * @description Update global log level, accepted: TRACE, DEBUG, INFO, WARN, ERROR
+     *
+     * @tags Utils
+     * @name PutUtilsUpdateGlobalLoglevel
+     * @request PUT:/utils/update-global-loglevel
+     */
+    putUtilsUpdateGlobalLoglevel: (data: 'TRACE' | 'DEBUG' | 'INFO' | 'WARN' | 'ERROR', params: RequestParams = {}) =>
+      this.request<void, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+        path: `/utils/update-global-loglevel`,
+        method: 'PUT',
+        body: data,
+        ...params
+      }).then(convertHttpResponse),
+
+    /**
+     * @description Update logging file, only logback.xml is accepted
+     *
+     * @tags Utils
+     * @name PutUtilsUpdateLogConfig
+     * @request PUT:/utils/update-log-config
+     */
+    putUtilsUpdateLogConfig: (data: string, params: RequestParams = {}) =>
+      this.request<void, BadRequest | Unauthorized | NotFound | InternalServerError | ServiceUnavailable>({
+        path: `/utils/update-log-config`,
+        method: 'PUT',
+        body: data,
+        ...params
       }).then(convertHttpResponse)
   }
 }