@tari-project/tarijs 0.5.2 → 0.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tarijs",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "keywords": [],

package/packages/builders/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tarijs-builders",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/indexer_provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/indexer-provider",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/metamask_signer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/metamask-signer",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tari_permissions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tari-permissions",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tari_provider/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tari-provider",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tari_signer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tari-signer",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tari_universe/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tari-universe-signer",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tarijs/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@tari-project/tarijs",
-  "version": "0.5.2",
+  "name": "@tari-project/tarijs-all",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {
@@ -8,7 +8,7 @@
   },
   "scripts": {
     "build": "tsc -b",
-    "test": "vitest run src",
+    "test": "vitest run unit-tests",
     "integration-tests": "vitest run integration-tests"
   },
   "keywords": [],

package/packages/tarijs/src/index.ts

@@ -1,12 +1,9 @@
+import { MetaMaskInpageProvider } from "@metamask/providers";
 import { TariSigner } from "@tari-project/tari-signer";
 import { TariProvider } from "@tari-project/tari-provider";
-import * as utils from "./utils";
-import { Network } from "./network";
 import { MetamaskTariSigner } from "@tari-project/metamask-signer";
-import { MetaMaskInpageProvider } from "@metamask/providers";
 import { WalletDaemonTariSigner, WalletDaemonParameters, TariPermissions } from "@tari-project/wallet-daemon-signer";
 import { TariUniverseSigner, TariUniverseSignerParameters } from "@tari-project/tari-universe-signer";
-import * as permissions from "@tari-project/tari-permissions";
 import { WalletConnectTariSigner } from "@tari-project/wallet-connect-signer";
 import {
   TransactionBuilder,
@@ -17,9 +14,6 @@ import {
   fromWorkspace,
   toWorkspace,
 } from "@tari-project/tarijs-builders";
-import * as templates from "./templates";
-import { parseCbor, getCborValueByPath } from "./cbor";
-import { IndexerProvider, IndexerProviderParameters } from "@tari-project/indexer-provider";
 import {
   convertStringToTransactionStatus,
   convertHexStringToU256Array,
@@ -36,11 +30,20 @@ import {
   TemplateDefinition,
   SubstateRequirement,
   Substate,
+  Network,
+  fromHexString,
+  toHexString,
+  parseCbor,
+  getCborValueByPath,
 } from "@tari-project/tarijs-types";
+import { IndexerProvider, IndexerProviderParameters } from "@tari-project/indexer-provider";
+import * as templates from "./templates";
+import * as permissions from "@tari-project/tari-permissions";
 
 export * from "@tari-project/tarijs-types";
 export {
-  utils,
+  permissions,
+  templates,
   Network,
   TariSigner,
   TariProvider,
@@ -76,8 +79,8 @@ export {
   convertU256ToHexString,
   createNftAddressFromResource,
   createNftAddressFromToken,
-  permissions,
-  templates,
   parseCbor,
   getCborValueByPath,
+  fromHexString,
+  toHexString,
 };

package/packages/tarijs/src/templates/Coin.ts

@@ -0,0 +1,58 @@
+import { Amount, ResourceAddress, TariFunctionDefinition, TariMethodDefinition } from "@tari-project/tarijs-builders";
+import { TemplateFactory } from "./TemplateFactory";
+
+interface NewFunction extends TariFunctionDefinition {
+  functionName: "new";
+  args?: [number, string];
+}
+
+interface MintFunction extends TariFunctionDefinition {
+  functionName: "mint";
+  args?: [Amount];
+}
+
+interface VaultAddressMethod extends TariMethodDefinition {
+  functionName: "vault_address";
+  args?: [];
+}
+
+interface TakeFreeCoinsMethod extends TariMethodDefinition {
+  methodName: "take_free_coins";
+  args?: [number];
+}
+interface BalanceMethod extends TariMethodDefinition {
+  methodName: "balance";
+  args?: [ResourceAddress];
+}
+interface BurnCoinsMethod extends TariMethodDefinition {
+  methodName: "burn_coins";
+  args?: [Amount];
+}
+interface TotalSupplyMethod extends TariMethodDefinition {
+  methodName: "total_supply";
+  args?: [];
+}
+
+export class CoinTemplate extends TemplateFactory {
+  public new: NewFunction;
+  public mint: MintFunction;
+  public takeFreeCoins: TakeFreeCoinsMethod;
+  public balance: BalanceMethod;
+  public burnCoins: BurnCoinsMethod;
+  public totalSupply: TotalSupplyMethod;
+  public vaultAddress: VaultAddressMethod;
+
+  constructor(public templateAddress: string) {
+    super(templateAddress);
+    this.new = this._defineFunction<NewFunction>("new");
+    this.mint = this._defineFunction<MintFunction>("mint");
+    this.takeFreeCoins = this._defineMethod<TakeFreeCoinsMethod>("take_free_coins");
+    this.balance = this._defineMethod<BalanceMethod>("balance");
+    this.burnCoins = this._defineMethod<BurnCoinsMethod>("burn_coins");
+    this.totalSupply = this._defineMethod<TotalSupplyMethod>("total_supply");
+    this.vaultAddress = this._defineMethod<VaultAddressMethod>("vault_address");
+  }
+
+  protected _initFunctions(): void {}
+  protected _initMethods(): void {}
+}

package/packages/tarijs/src/templates/Tex.ts

@@ -0,0 +1,54 @@
+import {
+  ResourceAddress,
+  TariFunctionDefinition,
+  TariMethodDefinition,
+  WorkspaceArg,
+} from "@tari-project/tarijs-builders";
+import { TemplateFactory } from "./TemplateFactory";
+
+interface NewFunction extends TariFunctionDefinition {
+  functionName: "new";
+  args?: [number];
+}
+
+interface SwapMethod extends TariMethodDefinition {
+  methodName: "swap";
+  args?: [WorkspaceArg, ResourceAddress];
+}
+
+interface AddLiquidityMethod extends TariMethodDefinition {
+  methodName: "add_liquidity";
+  args?: WorkspaceArg[];
+}
+
+interface RemoveLiquidityMethod extends TariMethodDefinition {
+  methodName: "remove_liquidity";
+  args?: WorkspaceArg[];
+}
+
+interface PoolsMethod extends TariMethodDefinition {
+  methodName: "pools";
+  args?: WorkspaceArg[];
+}
+
+export class TexTemplate extends TemplateFactory {
+  public new: NewFunction;
+  public swap: SwapMethod;
+  public addLiquidity: AddLiquidityMethod;
+  public removeLiquidity: RemoveLiquidityMethod;
+  public pools: PoolsMethod;
+
+  constructor(public templateAddress: string) {
+    super(templateAddress);
+    this.new = this._defineFunction<NewFunction>("new");
+    this.swap = this._defineMethod<SwapMethod>("swap");
+    this.addLiquidity = this._defineMethod<AddLiquidityMethod>("add_liquidity");
+    this.removeLiquidity = this._defineMethod<RemoveLiquidityMethod>("remove_liquidity");
+    this.pools = this._defineMethod<PoolsMethod>("pools");
+    this._initFunctions();
+    this._initMethods();
+  }
+
+  protected _initFunctions(): void {}
+  protected _initMethods(): void {}
+}

package/packages/tarijs/src/templates/index.ts

@@ -3,3 +3,5 @@ export { AccountTemplate } from "./Account";
 export { TariswapTemplate } from "./Tariswap";
 export { PoolTemplate } from "./Pool";
 export { TestFaucet } from "./TestFaucet";
+export { CoinTemplate } from "./Coin";
+export { TexTemplate } from "./Tex";

package/packages/tarijs/test/integration-tests/.env

@@ -0,0 +1 @@
+WALLET_DAEMON_JSON_RPC_URL=http://127.0.0.1:9000/json_rpc

package/packages/tarijs/{integration-tests → test/integration-tests}/wallet_daemon/json_rpc_provider.spec.ts

@@ -1,10 +1,11 @@
 import { assert, describe, expect, it } from "vitest";
 
-import { SubmitTransactionRequest, TariPermissions, WalletDaemonTariSigner } from "../../src";
+import { Network, SubmitTransactionRequest, TariPermissions, WalletDaemonTariSigner } from "../../../src";
 
 function buildSigner(): Promise<WalletDaemonTariSigner> {
   const permissions = new TariPermissions().addPermission("Admin");
   const serverUrl = process.env.WALLET_DAEMON_JSON_RPC_URL;
+
   assert(serverUrl, "WALLET_DAEMON_JSON_RPC_URL must be set");
   return WalletDaemonTariSigner.buildFetchSigner({
     permissions,
@@ -43,8 +44,14 @@ describe("WalletDaemonTariSigner", () => {
   describe("getSubstate", () => {
     it("returns substate details", async () => {
       const signer = await buildSigner();
-      const listedSubstates = await signer.listSubstates(null, null, 1, 0);
+      const listedSubstates = await signer.listSubstates({
+        filter_by_template: null,
+        filter_by_type: null,
+        limit: 1,
+        offset: 0,
+      });
       const firstSubstate = listedSubstates.substates[0];
+      console.log(firstSubstate);
       const substate = await signer.getSubstate(firstSubstate.substate_id);
 
       expect(substate).toMatchObject({
@@ -87,7 +94,7 @@ describe("WalletDaemonTariSigner", () => {
       ];
 
       const request: SubmitTransactionRequest = {
-        network: 0x10, // LocalNet
+        network: Network.LocalNet,
         account_id: account.account_id,
         fee_instructions,
         instructions: [],
@@ -163,27 +170,47 @@ describe("WalletDaemonTariSigner", () => {
   describe("listSubstates", () => {
     it("returns substates", async () => {
       const signer = await buildSigner();
-      const { substates } = await signer.listSubstates(null, null, 10, 0);
+      const { substates } = await signer.listSubstates({
+        filter_by_template: null,
+        filter_by_type: null,
+        limit: 10,
+        offset: 0,
+      });
 
       expect(substates.length).toBeGreaterThan(0);
     });
 
     it("filters substates by template address", async () => {
       const signer = await buildSigner();
-      const { substates } = await signer.listSubstates(null, null, 10, 0);
+      const { substates } = await signer.listSubstates({
+        filter_by_template: null,
+        filter_by_type: null,
+        limit: 10,
+        offset: 0,
+      });
 
       const substateWithTemplate = substates.find((substate) => substate.template_address);
       assert(substateWithTemplate, "No substate with template found");
 
       const templateAddress = substateWithTemplate.template_address;
-      const { substates: filteredSubstates } = await signer.listSubstates(templateAddress, null, 10, 0);
+      const { substates: filteredSubstates } = await signer.listSubstates({
+        filter_by_template: templateAddress,
+        filter_by_type: null,
+        limit: 10,
+        offset: 0,
+      });
 
       expect(filteredSubstates.every((substate) => substate.template_address === templateAddress)).toBe(true);
     });
 
     it("filters substates by type", async () => {
       const signer = await buildSigner();
-      const { substates } = await signer.listSubstates(null, "Component", 10, 0);
+      const { substates } = await signer.listSubstates({
+        filter_by_template: null,
+        filter_by_type: "Component",
+        limit: 1,
+        offset: 0,
+      });
 
       expect(substates.every((substate) => substate.module_name)).toBe(true);
     });

package/packages/tarijs/{src → test/unit-tests}/cbor.spec.ts

@@ -1,5 +1,5 @@
-import { assert, describe, expect, it, vi } from "vitest";
-import { BinaryTag, CborValue, convertTaggedValue, getCborValueByPath, parseCbor } from "./cbor";
+import { describe, expect, it } from "vitest";
+import { BinaryTag, CborValue, convertTaggedValue, getCborValueByPath, parseCbor } from "@tari-project/tarijs-types";
 
 describe("convertTaggedValue", () => {
   it.each([
@@ -201,7 +201,7 @@ describe("parseCbor", () => {
       expect(parseCbor(value as CborValue)).toEqual(expected);
     });
   });
-  
+
   it.each([{}, { Unknown: 2 }])("throws, when data in unknown format is found", (value: unknown) => {
     expect(() => parseCbor(value as CborValue)).toThrow();
   });

package/packages/tarijs/tsconfig.json

@@ -7,9 +7,7 @@
     "outDir": "./dist",
     "rootDir": "./src"
   },
-  "include": [
-    "src/**/*"
-  ],
+  "include": ["src/**/*"],
   "references": [
     {
       "path": "../builders"

package/packages/tarijs/vitest.config.ts

@@ -1,8 +1,8 @@
-import { defineConfig } from 'vitest/config';
-import { loadEnv } from 'vite';
+import { defineConfig } from "vitest/config";
+import { loadEnv } from "vite";
 
 export default defineConfig({
-  root: '.',
+  root: ".",
   test: {
     env: loadEnv("", "./integration-tests/", ""),
   },

package/packages/tarijs_types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/tarijs-types",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tarijs_types/src/helpers/index.ts

@@ -1,5 +1,7 @@
 import { NonFungibleId, NonFungibleToken, ResourceAddress } from "@tari-project/typescript-bindings";
 import { TransactionStatus } from "../TransactionStatus";
+export { fromHexString, toHexString } from "./hexString";
+export { BinaryTag, CborValue, convertTaggedValue, getCborValueByPath, parseCbor } from "./cbor";
 export {
   substateIdToString,
   stringToSubstateId,

package/packages/tarijs_types/src/index.ts

@@ -23,6 +23,7 @@ export { UnsignedTransaction } from "./UnsignedTransaction";
 export { VersionedSubstateId } from "./VersionedSubstateId";
 export { WorkspaceArg } from "./Workspace";
 export { ListAccountNftFromBalancesRequest } from "./ListAccountNftFromBalancesRequest";
+export { Network } from "./network";
 export {
   AccountData,
   ListSubstatesRequest,
@@ -51,4 +52,11 @@ export {
   shortenSubstateId,
   stringToSubstateId,
   substateIdToString,
+  fromHexString,
+  toHexString,
+  convertTaggedValue,
+  getCborValueByPath,
+  parseCbor,
+  BinaryTag,
+  CborValue,
 } from "./helpers";

package/packages/wallet_daemon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/wallet-daemon-signer",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/walletconnect/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tari-project/wallet-connect-signer",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "",
   "type": "module",
   "publishConfig": {

package/packages/tarijs/integration-tests/.env

@@ -1 +0,0 @@
-WALLET_DAEMON_JSON_RPC_URL=http://127.0.0.1:12011/json_rpc