opnet 1.0.16 → 1.0.17

package/build/contracts/CallResult.d.ts

@@ -1,5 +1,6 @@
 import { BinaryReader, NetEvent } from '@btc-vision/bsi-binary';
 import { DecodedCallResult } from '../common/CommonTypes.js';
+import { ContractDecodedObjectResult, DecodedOutput } from './Contract.js';
 import { IAccessList } from './interfaces/IAccessList.js';
 import { ICallResultData } from './interfaces/ICallResult.js';
 export declare class CallResult implements ICallResultData {
@@ -7,7 +8,8 @@ export declare class CallResult implements ICallResultData {
     readonly events: NetEvent[];
     readonly accessList: IAccessList;
     readonly decoded: Array<DecodedCallResult>;
+    properties: ContractDecodedObjectResult;
     constructor(iCallResult: ICallResultData);
-    setDecoded(decoded: Array<DecodedCallResult>): void;
+    setDecoded(decoded: DecodedOutput): void;
     private base64ToUint8Array;
 }

package/build/contracts/CallResult.js

@@ -4,6 +4,7 @@ export class CallResult {
     events;
     accessList;
     decoded = [];
+    properties = {};
     constructor(iCallResult) {
         this.events = iCallResult.events;
         this.accessList = iCallResult.accessList;
@@ -13,7 +14,8 @@ export class CallResult {
                 : iCallResult.result;
     }
     setDecoded(decoded) {
-        this.decoded.push(...decoded);
+        this.properties = Object.freeze(decoded.obj);
+        this.decoded.push(...decoded.values);
     }
     base64ToUint8Array(base64) {
         return BufferHelper.bufferToUint8Array(Buffer.from(base64, 'base64'));

package/build/contracts/Contract.d.ts

@@ -2,10 +2,17 @@ import { BaseContractProperty } from '../abi/BaseContractProperty.js';
 import { BitcoinInterface } from '../abi/BitcoinInterface.js';
 import { BaseContractProperties } from '../abi/interfaces/BaseContractProperties.js';
 import { BitcoinInterfaceAbi } from '../abi/interfaces/BitcoinInterfaceAbi.js';
-import { BitcoinAddressLike } from '../common/CommonTypes.js';
+import { BitcoinAddressLike, DecodedCallResult } from '../common/CommonTypes.js';
 import { AbstractRpcProvider } from '../providers/AbstractRpcProvider.js';
 import { IContract } from './interfaces/IContract.js';
 declare const internal: unique symbol;
+export type ContractDecodedObjectResult = {
+    [key: string]: DecodedCallResult;
+};
+export type DecodedOutput = {
+    values: Array<DecodedCallResult>;
+    obj: ContractDecodedObjectResult;
+};
 export declare abstract class IBaseContract<T extends BaseContractProperties> implements IContract {
     readonly address: BitcoinAddressLike;
     readonly interface: BitcoinInterface;

package/build/contracts/Contract.js

@@ -113,42 +113,49 @@ export class IBaseContract {
     }
     decodeOutput(abi, reader) {
         const result = [];
+        const obj = {};
         for (let i = 0; i < abi.length; i++) {
             const type = abi[i].type;
             const name = abi[i].name;
+            let decodedResult;
             switch (type) {
                 case ABIDataTypes.UINT256:
-                    result.push(reader.readU256());
+                    decodedResult = reader.readU256();
                     break;
                 case ABIDataTypes.BOOL:
-                    result.push(reader.readBoolean());
+                    decodedResult = reader.readBoolean();
                     break;
                 case ABIDataTypes.STRING:
-                    result.push(reader.readStringWithLength());
+                    decodedResult = reader.readStringWithLength();
                     break;
                 case ABIDataTypes.ADDRESS:
-                    result.push(reader.readAddress());
+                    decodedResult = reader.readAddress();
                     break;
                 case ABIDataTypes.TUPLE:
-                    result.push(reader.readTuple());
+                    decodedResult = reader.readTuple();
                     break;
                 case ABIDataTypes.UINT8:
-                    result.push(reader.readU8());
+                    decodedResult = reader.readU8();
                     break;
                 case ABIDataTypes.UINT16:
-                    result.push(reader.readU16());
+                    decodedResult = reader.readU16();
                     break;
                 case ABIDataTypes.UINT32:
-                    result.push(reader.readU32());
+                    decodedResult = reader.readU32();
                     break;
                 case ABIDataTypes.BYTES32:
-                    result.push(reader.readBytes(32));
+                    decodedResult = reader.readBytes(32);
                     break;
                 default:
                     throw new Error(`Unsupported type: ${type} (${name})`);
             }
+            result.push(decodedResult);
+            obj[name] = decodedResult;
         }
-        return result;
+        return {
+            values: result,
+            obj: obj,
+        };
     }
     callFunction(element) {
         return async (...args) => {
@@ -159,7 +166,7 @@ export class IBaseContract {
             }
             const decoded = element.outputs
                 ? this.decodeOutput(element.outputs, response.result)
-                : [];
+                : { values: [], obj: {} };
             response.setDecoded(decoded);
             return response;
         };

package/build/scripts/testContract.js

@@ -34,8 +34,8 @@ const provider = new JSONRpcProvider('https://testnet.opnet.org');
         },
     ];
     const contract = getContract('tb1pth90usc4f528aqphpjrfkkdm4vy8hxnt5gps6aau2nva6pxeshtqqzlt3a', abi, provider);
-    const res = (await contract.balanceOf('bc1p134a291b21a4ef28c961daee77a75e81cd7c0f00733a152930f76746a3e9'));
-    console.log('Balance:', res.decoded);
+    const balanceExample = (await contract.balanceOf('bc1p134a291b21a4ef28c961daee77a75e81cd7c0f00733a152930f76746a3e9'));
+    console.log('Balance:', balanceExample.decoded);
     const owner = (await contract.owner());
-    console.log('Owner:', owner.decoded);
+    console.log('Owner:', owner.properties);
 })();

package/build/transactions/DeploymentTransaction.d.ts

@@ -11,5 +11,6 @@ export declare class DeploymentTransaction extends TransactionBase<OPNetTransact
     readonly deployerAddress: string;
     readonly contractSeed: Buffer;
     readonly contractSaltHash: Buffer;
+    readonly from: string;
     constructor(transaction: IDeploymentTransaction);
 }

package/build/transactions/DeploymentTransaction.js

@@ -8,8 +8,10 @@ export class DeploymentTransaction extends TransactionBase {
     deployerAddress;
     contractSeed;
     contractSaltHash;
+    from;
     constructor(transaction) {
         super(transaction);
+        this.from = transaction.from;
         this.contractAddress = transaction.contractAddress;
         this.virtualAddress = transaction.virtualAddress;
         this.bytecode = Buffer.from(transaction.bytecode, 'base64');

package/build/transactions/InteractionTransaction.d.ts

@@ -13,5 +13,7 @@ export declare class InteractionTransaction extends TransactionBase<OPNetTransac
     readonly events: NetEvent[];
     readonly receipt?: Buffer;
     readonly receiptProofs?: string[];
+    readonly from: string;
+    readonly contractAddress: string;
     constructor(transaction: IInteractionTransaction);
 }

package/build/transactions/InteractionTransaction.js

@@ -9,6 +9,8 @@ export class InteractionTransaction extends TransactionBase {
     events;
     receipt;
     receiptProofs;
+    from;
+    contractAddress;
     constructor(transaction) {
         super(transaction);
         this.calldata = Buffer.from(transaction.calldata, 'base64');
@@ -16,6 +18,8 @@ export class InteractionTransaction extends TransactionBase {
         this.contractSecret = Buffer.from(transaction.contractSecret, 'base64');
         this.interactionPubKey = Buffer.from(transaction.interactionPubKey, 'base64');
         this.wasCompressed = transaction.wasCompressed;
+        this.from = transaction.from;
+        this.contractAddress = transaction.contractAddress;
         this.events = transaction.events;
         this.receipt = transaction.receipt
             ? Buffer.from(transaction.receipt, 'base64')

package/build/transactions/interfaces/ITransaction.d.ts

@@ -16,22 +16,26 @@ export interface ITransactionBase<T extends OPNetTransactionTypes> {
 }
 export interface IGenericTransaction extends ITransactionBase<OPNetTransactionTypes.Generic> {
 }
-export interface IDeploymentTransaction extends ITransactionBase<OPNetTransactionTypes.Deployment> {
+export interface ICommonTransaction<T extends OPNetTransactionTypes> extends ITransactionBase<T> {
+    readonly from: string;
+    readonly wasCompressed: boolean;
     readonly contractAddress: string;
+}
+export interface IDeploymentTransaction extends ICommonTransaction<OPNetTransactionTypes.Deployment> {
     readonly virtualAddress: string;
     readonly bytecode: Buffer | string;
-    readonly wasCompressed: boolean;
     readonly deployerPubKey: Buffer | string;
     readonly deployerAddress: string;
     readonly contractSeed: Buffer | string;
     readonly contractSaltHash: Buffer | string;
 }
-export interface IInteractionTransaction extends ITransactionBase<OPNetTransactionTypes.Interaction> {
+export interface IInteractionTransaction extends ICommonTransaction<OPNetTransactionTypes.Interaction> {
     readonly calldata: string | Buffer;
     readonly senderPubKeyHash: string | Buffer;
     readonly contractSecret: string | Buffer;
     readonly interactionPubKey: string | Buffer;
     readonly wasCompressed: boolean;
+    readonly from: string;
     readonly events: NetEvent[];
     readonly receipt?: string | Buffer;
     readonly receiptProofs?: string[];

package/package.json

@@ -1,6 +1,6 @@
 {
     "type": "module",
-    "version": "1.0.16",
+    "version": "1.0.17",
     "author": "BlobMaster41",
     "description": "The perfect library for building Bitcoin based applications.",
     "engines": {

package/src/contracts/CallResult.ts

@@ -1,5 +1,6 @@
 import { BinaryReader, BufferHelper, NetEvent } from '@btc-vision/bsi-binary';
 import { DecodedCallResult } from '../common/CommonTypes.js';
+import { ContractDecodedObjectResult, DecodedOutput } from './Contract.js';
 import { IAccessList } from './interfaces/IAccessList.js';
 import { ICallResultData } from './interfaces/ICallResult.js';
 
@@ -13,6 +14,7 @@ export class CallResult implements ICallResultData {
     public readonly accessList: IAccessList;
 
     public readonly decoded: Array<DecodedCallResult> = [];
+    public properties: ContractDecodedObjectResult = {};
 
     constructor(iCallResult: ICallResultData) {
         this.events = iCallResult.events;
@@ -24,8 +26,10 @@ export class CallResult implements ICallResultData {
                 : iCallResult.result;
     }
 
-    public setDecoded(decoded: Array<DecodedCallResult>): void {
-        this.decoded.push(...decoded);
+    public setDecoded(decoded: DecodedOutput): void {
+        this.properties = Object.freeze(decoded.obj);
+
+        this.decoded.push(...decoded.values);
     }
 
     private base64ToUint8Array(base64: string): Uint8Array {

package/src/contracts/Contract.ts

@@ -15,6 +15,9 @@ import { IContract } from './interfaces/IContract.js';
 const internal = Symbol.for('_btc_internal');
 const bitcoinAbiCoder = new ABICoder();
 
+export type ContractDecodedObjectResult = { [key: string]: DecodedCallResult };
+export type DecodedOutput = { values: Array<DecodedCallResult>; obj: ContractDecodedObjectResult };
+
 /**
  * Represents the base contract class.
  * @category Contracts
@@ -172,47 +175,55 @@ export abstract class IBaseContract<T extends BaseContractProperties> implements
         }
     }
 
-    private decodeOutput(abi: BitcoinAbiValue[], reader: BinaryReader): Array<DecodedCallResult> {
+    private decodeOutput(abi: BitcoinAbiValue[], reader: BinaryReader): DecodedOutput {
         const result: Array<DecodedCallResult> = [];
+        const obj: ContractDecodedObjectResult = {};
 
         for (let i = 0; i < abi.length; i++) {
             const type = abi[i].type;
             const name = abi[i].name;
 
+            let decodedResult: DecodedCallResult;
             switch (type) {
                 case ABIDataTypes.UINT256:
-                    result.push(reader.readU256());
+                    decodedResult = reader.readU256();
                     break;
                 case ABIDataTypes.BOOL:
-                    result.push(reader.readBoolean());
+                    decodedResult = reader.readBoolean();
                     break;
                 case ABIDataTypes.STRING:
-                    result.push(reader.readStringWithLength());
+                    decodedResult = reader.readStringWithLength();
                     break;
                 case ABIDataTypes.ADDRESS:
-                    result.push(reader.readAddress());
+                    decodedResult = reader.readAddress();
                     break;
                 case ABIDataTypes.TUPLE:
-                    result.push(reader.readTuple());
+                    decodedResult = reader.readTuple();
                     break;
                 case ABIDataTypes.UINT8:
-                    result.push(reader.readU8());
+                    decodedResult = reader.readU8();
                     break;
                 case ABIDataTypes.UINT16:
-                    result.push(reader.readU16());
+                    decodedResult = reader.readU16();
                     break;
                 case ABIDataTypes.UINT32:
-                    result.push(reader.readU32());
+                    decodedResult = reader.readU32();
                     break;
                 case ABIDataTypes.BYTES32:
-                    result.push(reader.readBytes(32));
+                    decodedResult = reader.readBytes(32);
                     break;
                 default:
                     throw new Error(`Unsupported type: ${type} (${name})`);
             }
+
+            result.push(decodedResult);
+            obj[name] = decodedResult;
         }
 
-        return result;
+        return {
+            values: result,
+            obj: obj,
+        };
     }
 
     private callFunction(
@@ -226,9 +237,10 @@ export abstract class IBaseContract<T extends BaseContractProperties> implements
                 return response;
             }
 
-            const decoded = element.outputs
+            const decoded: DecodedOutput = element.outputs
                 ? this.decodeOutput(element.outputs, response.result)
-                : [];
+                : { values: [], obj: {} };
+
             response.setDecoded(decoded);
 
             return response;

package/src/scripts/testContract.ts

@@ -11,8 +11,6 @@ import { JSONRpcProvider } from '../providers/JSONRpcProvider.js';
 const provider: JSONRpcProvider = new JSONRpcProvider('https://testnet.opnet.org');
 
 interface TestContract extends BaseContractProperties {
-    giveFreeMoney(bool: true): Promise<BaseContractProperty>;
-
     balanceOf(address: BitcoinAddressLike): Promise<BaseContractProperty>;
 
     owner(): Promise<BaseContractProperty>;
@@ -56,14 +54,12 @@ interface TestContract extends BaseContractProperties {
         provider,
     );
 
-    // 13sBQqJdnAdc7v5tnX3ifYqAMoFX79VfLy
-    const res: CallResult = (await contract.balanceOf(
+    const balanceExample: CallResult = (await contract.balanceOf(
         'bc1p134a291b21a4ef28c961daee77a75e81cd7c0f00733a152930f76746a3e9',
     )) as CallResult;
 
-    console.log('Balance:', res.decoded);
+    console.log('Balance:', balanceExample.decoded);
 
     const owner = (await contract.owner()) as CallResult;
-
-    console.log('Owner:', owner.decoded);
+    console.log('Owner:', owner.properties);
 })();

package/src/transactions/DeploymentTransaction.ts

@@ -5,7 +5,7 @@ import { TransactionBase } from './Transaction.js';
 /**
  * @description This class is used to provide a deployment transaction.
  * @class DeploymentTransaction
- * @category Transactions
+ * @category Transactions<>
  */
 export class DeploymentTransaction
     extends TransactionBase<OPNetTransactionTypes.Deployment>
@@ -23,9 +23,13 @@ export class DeploymentTransaction
     public readonly contractSeed: Buffer;
     public readonly contractSaltHash: Buffer;
 
+    public readonly from: string;
+
     constructor(transaction: IDeploymentTransaction) {
         super(transaction);
 
+        this.from = transaction.from;
+
         this.contractAddress = transaction.contractAddress;
         this.virtualAddress = transaction.virtualAddress;
 

package/src/transactions/InteractionTransaction.ts

@@ -24,6 +24,9 @@ export class InteractionTransaction
 
     public readonly receiptProofs?: string[];
 
+    public readonly from: string;
+    public readonly contractAddress: string;
+
     constructor(transaction: IInteractionTransaction) {
         super(transaction);
 
@@ -33,6 +36,8 @@ export class InteractionTransaction
         this.interactionPubKey = Buffer.from(transaction.interactionPubKey as string, 'base64');
 
         this.wasCompressed = transaction.wasCompressed;
+        this.from = transaction.from;
+        this.contractAddress = transaction.contractAddress;
 
         this.events = transaction.events;
         this.receipt = transaction.receipt

package/src/transactions/interfaces/ITransaction.ts

@@ -32,17 +32,22 @@ export interface ITransactionBase<T extends OPNetTransactionTypes> {
  */
 export interface IGenericTransaction extends ITransactionBase<OPNetTransactionTypes.Generic> {}
 
+export interface ICommonTransaction<T extends OPNetTransactionTypes> extends ITransactionBase<T> {
+    readonly from: string;
+    readonly wasCompressed: boolean;
+    readonly contractAddress: string;
+}
+
 /**
  * @description This interface represents a deployment transaction.
  * @interface IDeploymentTransaction
  * @category ITransactions
  */
-export interface IDeploymentTransaction extends ITransactionBase<OPNetTransactionTypes.Deployment> {
-    readonly contractAddress: string;
+export interface IDeploymentTransaction
+    extends ICommonTransaction<OPNetTransactionTypes.Deployment> {
     readonly virtualAddress: string;
 
     readonly bytecode: Buffer | string;
-    readonly wasCompressed: boolean;
 
     readonly deployerPubKey: Buffer | string;
     readonly deployerAddress: string;
@@ -57,7 +62,7 @@ export interface IDeploymentTransaction extends ITransactionBase<OPNetTransactio
  * @category ITransactions
  */
 export interface IInteractionTransaction
-    extends ITransactionBase<OPNetTransactionTypes.Interaction> {
+    extends ICommonTransaction<OPNetTransactionTypes.Interaction> {
     readonly calldata: string | Buffer;
     readonly senderPubKeyHash: string | Buffer;
     readonly contractSecret: string | Buffer;
@@ -65,6 +70,8 @@ export interface IInteractionTransaction
 
     readonly wasCompressed: boolean;
 
+    readonly from: string;
+
     readonly events: NetEvent[];
     readonly receipt?: string | Buffer;
     readonly receiptProofs?: string[];