@alephium/web3 0.2.0-rc.21 → 0.2.0-rc.23

package/dist/src/contract/contract.js

@@ -598,7 +598,7 @@ class Contract extends Artifact {
     async transactionForDeployment(signer, params) {
         const signerParams = await this.paramsForDeployment({
             ...params,
-            signerAddress: (await signer.getAccounts())[0].address
+            signerAddress: (await signer.getActiveAccount()).address
         });
         const response = await signer.buildContractCreationTx(signerParams);
         return fromApiDeployContractUnsignedTx(response);
@@ -666,7 +666,7 @@ class Script extends Artifact {
     async transactionForDeployment(signer, params) {
         const signerParams = await this.paramsForDeployment({
             ...params,
-            signerAddress: (await signer.getAccounts())[0].address
+            signerAddress: (await signer.getActiveAccount()).address
         });
         return await signer.buildScriptTx(signerParams);
     }

package/dist/src/contract/events.js

@@ -18,6 +18,7 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribeToEvents = exports.EventSubscription = void 0;
+const __1 = require("..");
 const utils_1 = require("../utils");
 class EventSubscription extends utils_1.Subscription {
     constructor(options, contractAddress, fromCount) {
@@ -37,7 +38,7 @@ class EventSubscription extends utils_1.Subscription {
     }
     async polling() {
         try {
-            const events = await this.provider.events.getEventsContractContractaddress(this.contractAddress, {
+            const events = await __1.web3.getCurrentNodeProvider().events.getEventsContractContractaddress(this.contractAddress, {
                 start: this.fromCount
             });
             if (this.cancelled) {

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

@@ -1,4 +1,4 @@
-import { NodeProvider, Number256, Token } from '../api';
+import { Number256, Token } from '../api';
 import { node } from '../api';
 export declare type OutputRef = node.OutputRef;
 export interface SignResult {
@@ -107,12 +107,14 @@ export interface SignerProvider {
     signMessage(params: SignMessageParams): Promise<SignMessageResult>;
 }
 export declare abstract class SignerWithNodeProvider implements SignerProvider {
-    readonly provider: NodeProvider;
     alwaysSubmitTx: boolean;
     abstract getAccounts(): Promise<Account[]>;
     getAccount(signerAddress: string): Promise<Account>;
+    abstract setActiveAccount(addressIndex: number): Promise<void>;
+    abstract setActiveAccount(address: string): Promise<void>;
+    abstract setActiveAccount(input: string | number): Promise<void>;
+    abstract getActiveAccount(): Promise<Account>;
     constructor(alwaysSubmitTx: boolean);
-    private defaultSignerAddress;
     submitTransaction(unsignedTx: string, signerAddress?: string): Promise<SubmissionResult>;
     private shouldSubmitTx;
     private usePublicKey;

package/dist/src/signer/signer.js

@@ -49,7 +49,7 @@ const api_1 = require("../api");
 const utils = __importStar(require("../utils"));
 const utils_1 = require("../utils");
 const blakejs_1 = __importDefault(require("blakejs"));
-const global_1 = require("../global");
+const __1 = require("..");
 const ec = new elliptic_1.ec('secp256k1');
 (0, utils_1.assertType)();
 (0, utils_1.assertType)();
@@ -65,7 +65,6 @@ const ec = new elliptic_1.ec('secp256k1');
 (0, utils_1.assertType)();
 class SignerWithNodeProvider {
     constructor(alwaysSubmitTx) {
-        this.provider = (0, global_1.getCurrentNodeProvider)();
         this.alwaysSubmitTx = alwaysSubmitTx;
     }
     async getAccount(signerAddress) {
@@ -78,16 +77,15 @@ class SignerWithNodeProvider {
             return account;
         }
     }
-    async defaultSignerAddress() {
-        return (await this.getAccounts())[0].address;
-    }
     async submitTransaction(unsignedTx, signerAddress) {
-        const decoded = await this.provider.transactions.postTransactionsDecodeUnsignedTx({ unsignedTx: unsignedTx });
+        const decoded = await __1.web3
+            .getCurrentNodeProvider()
+            .transactions.postTransactionsDecodeUnsignedTx({ unsignedTx: unsignedTx });
         const txId = decoded.unsignedTx.txId;
-        const address = typeof signerAddress !== 'undefined' ? signerAddress : await this.defaultSignerAddress();
+        const address = typeof signerAddress !== 'undefined' ? signerAddress : (await this.getActiveAccount()).address;
         const signature = await this.signRaw(address, txId);
         const params = { unsignedTx: unsignedTx, signature: signature };
-        return this.provider.transactions.postTransactionsSubmit(params);
+        return __1.web3.getCurrentNodeProvider().transactions.postTransactionsSubmit(params);
     }
     shouldSubmitTx(params) {
         return this.alwaysSubmitTx || (params.submitTx ? params.submitTx : true);
@@ -113,7 +111,7 @@ class SignerWithNodeProvider {
             destinations: toApiDestinations(params.destinations),
             gasPrice: (0, api_1.toApiNumber256Optional)(params.gasPrice)
         };
-        return this.provider.transactions.postTransactionsBuild(data);
+        return __1.web3.getCurrentNodeProvider().transactions.postTransactionsBuild(data);
     }
     async signDeployContractTx(params) {
         const response = await this.buildContractCreationTx(params);
@@ -129,7 +127,7 @@ class SignerWithNodeProvider {
             issueTokenAmount: (0, api_1.toApiNumber256Optional)(params.issueTokenAmount),
             gasPrice: (0, api_1.toApiNumber256Optional)(params.gasPrice)
         };
-        return this.provider.contracts.postContractsUnsignedTxDeployContract(data);
+        return __1.web3.getCurrentNodeProvider().contracts.postContractsUnsignedTxDeployContract(data);
     }
     async signExecuteScriptTx(params) {
         const response = await this.buildScriptTx(params);
@@ -140,13 +138,13 @@ class SignerWithNodeProvider {
             ...(await this.usePublicKey(params)),
             tokens: (0, api_1.toApiTokens)(params.tokens)
         };
-        return this.provider.contracts.postContractsUnsignedTxExecuteScript(data);
+        return __1.web3.getCurrentNodeProvider().contracts.postContractsUnsignedTxExecuteScript(data);
     }
     // in general, wallet should show the decoded information to user for confirmation
     // please overwrite this function for real wallet
     async signUnsignedTx(params) {
         const data = { unsignedTx: params.unsignedTx };
-        const decoded = await this.provider.transactions.postTransactionsDecodeUnsignedTx(data);
+        const decoded = await __1.web3.getCurrentNodeProvider().transactions.postTransactionsDecodeUnsignedTx(data);
         return this.handleSign({
             fromGroup: decoded.fromGroup,
             toGroup: decoded.toGroup,
@@ -161,7 +159,7 @@ class SignerWithNodeProvider {
         const signature = await this.signRaw(response.signerAddress, response.txId);
         // submit the tx if required
         if (submitTx) {
-            await this.provider.transactions.postTransactionsSubmit({
+            await __1.web3.getCurrentNodeProvider().transactions.postTransactionsSubmit({
                 unsignedTx: response.unsignedTx,
                 signature: signature
             });

package/dist/src/transaction/status.js

@@ -18,6 +18,7 @@ along with the library. If not, see <http://www.gnu.org/licenses/>.
 */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.subscribeToTxStatus = exports.TxStatusSubscription = void 0;
+const __1 = require("..");
 const utils_1 = require("../utils");
 class TxStatusSubscription extends utils_1.Subscription {
     constructor(options, txId, fromGroup, toGroup) {
@@ -29,7 +30,7 @@ class TxStatusSubscription extends utils_1.Subscription {
     }
     async polling() {
         try {
-            const txStatus = await this.provider.transactions.getTransactionsStatus({
+            const txStatus = await __1.web3.getCurrentNodeProvider().transactions.getTransactionsStatus({
                 txId: this.txId,
                 fromGroup: this.fromGroup,
                 toGroup: this.toGroup

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

@@ -1,5 +1,4 @@
 import EventEmitter from 'eventemitter3';
-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> {
@@ -8,7 +7,6 @@ export interface SubscribeOptions<Message> {
     errorCallback: ErrorCallback<Message>;
 }
 export declare abstract class Subscription<Message> {
-    provider: NodeProvider;
     pollingInterval: number;
     protected messageCallback: MessageCallback<Message>;
     protected errorCallback: ErrorCallback<Message>;

package/dist/src/utils/subscription.js

@@ -22,10 +22,8 @@ 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 = (0, global_1.getCurrentNodeProvider)();
         this.pollingInterval = options.pollingInterval;
         this.messageCallback = options.messageCallback;
         this.errorCallback = options.errorCallback;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alephium/web3",
-  "version": "0.2.0-rc.21",
+  "version": "0.2.0-rc.23",
   "description": "A JS/TS library to interact with the Alephium platform",
   "license": "GPL",
   "main": "dist/src/index.js",

package/src/contract/contract.ts

@@ -828,7 +828,7 @@ export class Contract extends Artifact {
   ): Promise<DeployContractTransaction> {
     const signerParams = await this.paramsForDeployment({
       ...params,
-      signerAddress: (await signer.getAccounts())[0].address
+      signerAddress: (await signer.getActiveAccount()).address
     })
     const response = await signer.buildContractCreationTx(signerParams)
     return fromApiDeployContractUnsignedTx(response)
@@ -914,7 +914,7 @@ export class Script extends Artifact {
   ): Promise<BuildScriptTxResult> {
     const signerParams = await this.paramsForDeployment({
       ...params,
-      signerAddress: (await signer.getAccounts())[0].address
+      signerAddress: (await signer.getActiveAccount()).address
     })
     return await signer.buildScriptTx(signerParams)
   }

package/src/contract/events.ts

@@ -16,6 +16,7 @@ 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/>.
 */
 
+import { web3 } from '..'
 import { node } from '../api'
 import { Subscription, SubscribeOptions } from '../utils'
 
@@ -44,7 +45,7 @@ export class EventSubscription extends Subscription<node.ContractEvent> {
 
   override async polling(): Promise<void> {
     try {
-      const events = await this.provider.events.getEventsContractContractaddress(this.contractAddress, {
+      const events = await web3.getCurrentNodeProvider().events.getEventsContractContractaddress(this.contractAddress, {
         start: this.fromCount
       })
       if (this.cancelled) {

package/src/signer/signer.ts

@@ -20,7 +20,6 @@ import { ec as EC } from 'elliptic'
 import {
   fromApiNumber256,
   fromApiTokens,
-  NodeProvider,
   Number256,
   toApiNumber256,
   toApiNumber256Optional,
@@ -31,7 +30,7 @@ import { node } from '../api'
 import * as utils from '../utils'
 import { Eq, assertType } from '../utils'
 import blake from 'blakejs'
-import { getCurrentNodeProvider } from '../global'
+import { web3 } from '..'
 
 export type OutputRef = node.OutputRef
 
@@ -163,7 +162,6 @@ export interface SignerProvider {
 }
 
 export abstract class SignerWithNodeProvider implements SignerProvider {
-  readonly provider: NodeProvider
   alwaysSubmitTx: boolean
 
   abstract getAccounts(): Promise<Account[]>
@@ -178,23 +176,26 @@ export abstract class SignerWithNodeProvider implements SignerProvider {
     }
   }
 
+  abstract setActiveAccount(addressIndex: number): Promise<void>
+  abstract setActiveAccount(address: string): Promise<void>
+  abstract setActiveAccount(input: string | number): Promise<void>
+
+  abstract getActiveAccount(): Promise<Account>
+
   constructor(alwaysSubmitTx: boolean) {
-    this.provider = getCurrentNodeProvider()
     this.alwaysSubmitTx = alwaysSubmitTx
   }
 
-  private async defaultSignerAddress(): Promise<string> {
-    return (await this.getAccounts())[0].address
-  }
-
   async submitTransaction(unsignedTx: string, signerAddress?: string): Promise<SubmissionResult> {
-    const decoded = await this.provider.transactions.postTransactionsDecodeUnsignedTx({ unsignedTx: unsignedTx })
+    const decoded = await web3
+      .getCurrentNodeProvider()
+      .transactions.postTransactionsDecodeUnsignedTx({ unsignedTx: unsignedTx })
     const txId = decoded.unsignedTx.txId
 
-    const address = typeof signerAddress !== 'undefined' ? signerAddress : await this.defaultSignerAddress()
+    const address = typeof signerAddress !== 'undefined' ? signerAddress : (await this.getActiveAccount()).address
     const signature = await this.signRaw(address, txId)
     const params: node.SubmitTransaction = { unsignedTx: unsignedTx, signature: signature }
-    return this.provider.transactions.postTransactionsSubmit(params)
+    return web3.getCurrentNodeProvider().transactions.postTransactionsSubmit(params)
   }
 
   private shouldSubmitTx(params: SubmitTx): boolean {
@@ -225,7 +226,7 @@ export abstract class SignerWithNodeProvider implements SignerProvider {
       destinations: toApiDestinations(params.destinations),
       gasPrice: toApiNumber256Optional(params.gasPrice)
     }
-    return this.provider.transactions.postTransactionsBuild(data)
+    return web3.getCurrentNodeProvider().transactions.postTransactionsBuild(data)
   }
 
   async signDeployContractTx(params: SignDeployContractTxParams): Promise<SignDeployContractTxResult> {
@@ -246,7 +247,7 @@ export abstract class SignerWithNodeProvider implements SignerProvider {
       issueTokenAmount: toApiNumber256Optional(params.issueTokenAmount),
       gasPrice: toApiNumber256Optional(params.gasPrice)
     }
-    return this.provider.contracts.postContractsUnsignedTxDeployContract(data)
+    return web3.getCurrentNodeProvider().contracts.postContractsUnsignedTxDeployContract(data)
   }
 
   async signExecuteScriptTx(params: SignExecuteScriptTxParams): Promise<SignExecuteScriptTxResult> {
@@ -259,14 +260,14 @@ export abstract class SignerWithNodeProvider implements SignerProvider {
       ...(await this.usePublicKey(params)),
       tokens: toApiTokens(params.tokens)
     }
-    return this.provider.contracts.postContractsUnsignedTxExecuteScript(data)
+    return web3.getCurrentNodeProvider().contracts.postContractsUnsignedTxExecuteScript(data)
   }
 
   // in general, wallet should show the decoded information to user for confirmation
   // please overwrite this function for real wallet
   async signUnsignedTx(params: SignUnsignedTxParams): Promise<SignUnsignedTxResult> {
     const data = { unsignedTx: params.unsignedTx }
-    const decoded = await this.provider.transactions.postTransactionsDecodeUnsignedTx(data)
+    const decoded = await web3.getCurrentNodeProvider().transactions.postTransactionsDecodeUnsignedTx(data)
     return this.handleSign(
       {
         fromGroup: decoded.fromGroup,
@@ -287,7 +288,7 @@ export abstract class SignerWithNodeProvider implements SignerProvider {
     const signature = await this.signRaw(response.signerAddress, response.txId)
     // submit the tx if required
     if (submitTx) {
-      await this.provider.transactions.postTransactionsSubmit({
+      await web3.getCurrentNodeProvider().transactions.postTransactionsSubmit({
         unsignedTx: response.unsignedTx,
         signature: signature
       })

package/src/transaction/status.ts

@@ -16,6 +16,7 @@ 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/>.
 */
 
+import { web3 } from '..'
 import { node } from '../api'
 import { Subscription, SubscribeOptions } from '../utils'
 
@@ -37,7 +38,7 @@ export class TxStatusSubscription extends Subscription<TxStatus> {
 
   override async polling(): Promise<void> {
     try {
-      const txStatus = await this.provider.transactions.getTransactionsStatus({
+      const txStatus = await web3.getCurrentNodeProvider().transactions.getTransactionsStatus({
         txId: this.txId,
         fromGroup: this.fromGroup,
         toGroup: this.toGroup

package/src/utils/subscription.ts

@@ -30,7 +30,6 @@ export interface SubscribeOptions<Message> {
 }
 
 export abstract class Subscription<Message> {
-  provider: NodeProvider
   pollingInterval: number
 
   protected messageCallback: MessageCallback<Message>
@@ -40,7 +39,6 @@ export abstract class Subscription<Message> {
   protected cancelled: boolean
 
   constructor(options: SubscribeOptions<Message>) {
-    this.provider = getCurrentNodeProvider()
     this.pollingInterval = options.pollingInterval
     this.messageCallback = options.messageCallback
     this.errorCallback = options.errorCallback