Merge pull request #210 from ElrondNetwork/improvements-05-08

Minor improvements / fixes

.github/workflows/erdjs-publish-alpha-beta.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
           registry-url: https://registry.npmjs.org/
 
       - name: Create release

.github/workflows/erdjs-publish.yml

@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 16
           registry-url: https://registry.npmjs.org/
 
       - name: Create release

.github/workflows/erdjs.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
     - uses: actions/checkout@v2

CHANGELOG.md

@@ -7,6 +7,9 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 ## Unreleased
  - TBD
 
+## 10.2.3
+ - [Minor improvements and fixes](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/210)
+
 ## 10.2.2
  - [Decoupling, minor refactoring](https://github.com/ElrondNetwork/elrond-sdk-erdjs/pull/209)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elrondnetwork/erdjs",
-  "version": "10.2.2",
+  "version": "10.2.3",
   "description": "Smart Contracts interaction framework",
   "main": "out/index.js",
   "types": "out/index.d.js",

src/interface.ts

@@ -8,6 +8,20 @@ export interface ITransactionFetcher {
     getTransaction(txHash: string): Promise<ITransactionOnNetwork>;
 }
 
+export interface IPlainTransactionObject {
+    nonce: number;
+    value: string;
+    receiver: string;
+    sender: string;
+    gasPrice: number;
+    gasLimit: number;
+    data?: string;
+    chainID: string;
+    version: number;
+    options?: number;
+    signature?: string;
+}
+
 export interface ISignature { hex(): string; }
 export interface IAddress { bech32(): string; }
 export interface ITransactionValue { toString(): string; }

src/smartcontracts/code.ts

@@ -21,4 +21,8 @@ export class Code {
     toString(): string {
         return this.hex;
     }
+
+    valueOf(): Buffer {
+        return Buffer.from(this.hex, "hex");
+    }
 }

src/smartcontracts/interaction.ts

@@ -35,6 +35,7 @@ export class Interaction {
     private gasPrice: IGasPrice | undefined = undefined;
     private chainID: IChainID = "";
     private querent: IAddress = new Address();
+    private explicitReceiver?: IAddress;
 
     private isWithSingleESDTTransfer: boolean = false;
     private isWithSingleESDTNFTTransfer: boolean = false;
@@ -81,8 +82,12 @@ export class Interaction {
         return this.gasLimit;
     }
 
+    getExplicitReceiver(): IAddress | undefined {
+        return this.explicitReceiver;
+    }
+
     buildTransaction(): Transaction {
-        let receiver = this.contract.getAddress();
+        let receiver = this.explicitReceiver || this.contract.getAddress();
         let func: ContractFunction = this.function;
         let args = this.args;
 
@@ -185,6 +190,11 @@ export class Interaction {
         return this;
     }
 
+    withExplicitReceiver(receiver: IAddress): Interaction {
+        this.explicitReceiver = receiver;
+        return this;
+    }
+
     /**
      * To perform custom checking, extend {@link Interaction} and override this method.
      */