chore: WIP add @seda-protocol/utils

sedaprotocol · Sep 27, 2024 · 5cf8fb4 · 5cf8fb4
1 parent f9c7fc3
commit 5cf8fb4
Show file tree

Hide file tree

Showing 18 changed files with 29 additions and 80 deletions.
diff --git a/libs/dev-tools/package.json b/libs/dev-tools/package.json
@@ -19,6 +19,7 @@
 		"@cosmjs/stargate": "^0.32.4",
 		"@cosmjs/tendermint-rpc": "^0.32.4",
 		"@seda-protocol/proto-messages": "0.3.0-dev.0-1",
+		"@seda-protocol/utils": "../../../seda-explorer/libs/seda-utils/seda-protocol-utils-0.0.1.tgz",
 		"@seda-protocol/vm": "^0.0.4",
 		"big.js": "^6.2.1",
 		"dotenv": "^16.3.1",

diff --git a/libs/dev-tools/src/cli/oracle-program/show.ts b/libs/dev-tools/src/cli/oracle-program/show.ts
@@ -1,14 +1,13 @@
-import { Command } from "commander";
-import { Maybe } from "true-myth";
-
 import {
 	spinnerError,
 	spinnerSuccess,
 	updateSpinnerText,
 } from "@dev-tools/cli-utils/spinner";
 import { buildQueryConfig } from "@dev-tools/services/config";
 import { createWasmQueryClient } from "@dev-tools/services/oracle-program/query-client";
-import { tryAsync } from "@dev-tools/utils/try-async";
+import { tryAsync } from "@seda-protocol/utils";
+import { Command } from "commander";
+import { Maybe } from "true-myth";
 
 export const show = new Command("show");
 show.description("show an Oracle Program in the SEDA chain");

diff --git a/libs/dev-tools/src/cli/oracle-program/upload.ts b/libs/dev-tools/src/cli/oracle-program/upload.ts
@@ -15,7 +15,7 @@ import { buildSigningConfig } from "@dev-tools/services/config";
 import { getOracleProgram } from "@dev-tools/services/oracle-program/get-oracle-program";
 import { uploadOracleProgram } from "@dev-tools/services/oracle-program/upload-oracle-program";
 import { Signer } from "@dev-tools/services/signer";
-import { tryAsync } from "@dev-tools/utils/try-async";
+import { tryAsync } from "@seda-protocol/utils";
 
 export const upload = new Command("upload");
 upload.description("upload an Oracle Program to the SEDA chain.");

diff --git a/libs/dev-tools/src/cli/utils/spinner.ts b/libs/dev-tools/src/cli/utils/spinner.ts
@@ -19,9 +19,13 @@ export const stopSpinner = () => {
 	}
 };
 
-export const spinnerError = (message?: string) => {
+export const spinnerError = (message?: unknown) => {
 	if (spinner.isSpinning) {
-		spinner.fail(message);
+		if (typeof message === "string" || message?.toString) {
+			spinner.fail(`${message}`);
+		} else {
+			spinner.fail("Unknown error");
+		}
 	}
 };
 

diff --git a/libs/dev-tools/src/lib/services/dr/await-data-result-bundle.ts b/libs/dev-tools/src/lib/services/dr/await-data-result-bundle.ts
@@ -1,6 +1,6 @@
 import type { ISigner } from "@dev-tools/services/signer";
 import { createSigningClient } from "@dev-tools/services/signing-client";
-import { tryAsync } from "@dev-tools/utils/try-async";
+import { tryAsync } from "@seda-protocol/utils";
 import { getDataResultBundle } from "./get-data-result-bundle";
 
 type Opts = {

diff --git a/libs/dev-tools/src/lib/services/dr/await-data-result.ts b/libs/dev-tools/src/lib/services/dr/await-data-result.ts
@@ -1,6 +1,6 @@
 import type { ISigner } from "@dev-tools/services/signer";
 import { createSigningClient } from "@dev-tools/services/signing-client";
-import { tryAsync } from "@dev-tools/utils/try-async";
+import { tryAsync } from "@seda-protocol/utils";
 import { getDataResult } from "./get-data-result";
 
 type Opts = {

diff --git a/libs/dev-tools/src/lib/services/dr/get-data-request-bundle-status.ts b/libs/dev-tools/src/lib/services/dr/get-data-request-bundle-status.ts
@@ -1,4 +1,4 @@
-import { tryAsync } from "@dev-tools/utils/try-async";
+import { tryAsync } from "@seda-protocol/utils";
 import type { ISigner } from "../signer";
 import {
 	type DataRequestStatus,
@@ -8,7 +8,7 @@ import {
 type StatusBatchResponse = {
 	drId: string;
 	status: DataRequestStatus | null;
-	error?: string;
+	error?: unknown;
 };
 
 export async function getDataRequestBundleStatus(

diff --git a/libs/dev-tools/src/lib/services/dr/get-data-result-bundle.ts b/libs/dev-tools/src/lib/services/dr/get-data-result-bundle.ts
@@ -1,11 +1,11 @@
-import { tryAsync } from "@dev-tools/utils/try-async";
+import { tryAsync } from "@seda-protocol/utils";
 import type { ISigner } from "../signer";
 import { type DataRequestResult, getDataResult } from "./get-data-result";
 
 type ResultBatchResponse = {
 	drId: string;
 	result: DataRequestResult | null;
-	error?: string;
+	error?: unknown;
 };
 
 export async function getDataResultBundle(

diff --git a/libs/dev-tools/src/lib/services/oracle-program/get-oracle-program.ts b/libs/dev-tools/src/lib/services/oracle-program/get-oracle-program.ts
@@ -1,4 +1,4 @@
-import { tryAsync } from "@dev-tools/utils/try-async";
+import { tryAsync } from "@seda-protocol/utils";
 import { Maybe, Result } from "true-myth";
 import type { ISigner } from "../signer";
 import { createWasmQueryClient } from "./query-client";
@@ -14,7 +14,7 @@ export async function getOracleProgram(
 			bytecode: Uint8Array;
 			expirationHeight: number;
 		}>,
-		string
+		unknown
 	>
 > {
 	const queryClient = await tryAsync(

diff --git a/libs/dev-tools/src/lib/services/sign-and-send-tx.ts b/libs/dev-tools/src/lib/services/sign-and-send-tx.ts
@@ -1,7 +1,7 @@
 import type { SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
 import type { EncodeObject } from "@cosmjs/proto-signing";
 import type { DeliverTxResponse, StdFee } from "@cosmjs/stargate";
-import { tryAsync } from "@dev-tools/utils/try-async";
+import { tryAsync } from "@seda-protocol/utils";
 import { Result, ResultNS } from "true-myth";
 import {
 	DEFAULT_ADJUSTMENT_FACTOR,

diff --git a/libs/dev-tools/src/lib/services/signer.ts b/libs/dev-tools/src/lib/services/signer.ts
@@ -3,7 +3,7 @@ import {
 	type OfflineSigner,
 } from "@cosmjs/proto-signing";
 import { createWasmQueryClient } from "@dev-tools/services/oracle-program/query-client";
-import { tryAsync } from "@dev-tools/utils/try-async";
+import { tryAsync } from "@seda-protocol/utils";
 import {
 	AUTO_CORE_CONTRACT_VALUE,
 	type SigningConfig,

diff --git a/libs/dev-tools/src/lib/services/signing-client.ts b/libs/dev-tools/src/lib/services/signing-client.ts
@@ -1,6 +1,6 @@
 import { SigningCosmWasmClient } from "@cosmjs/cosmwasm-stargate";
-import { tryAsync } from "@dev-tools/utils/try-async";
 import { sedachain } from "@seda-protocol/proto-messages";
+import { tryAsync } from "@seda-protocol/utils";
 import { MsgExecuteContractResponse } from "cosmjs-types/cosmwasm/wasm/v1/tx";
 import { Result } from "true-myth";
 import type { ISigner } from "./signer";

diff --git a/libs/dev-tools/src/lib/utils/try-async.ts b/libs/dev-tools/src/lib/utils/try-async.ts
diff --git a/libs/vm/package.json b/libs/vm/package.json
@@ -6,6 +6,7 @@
 		"@wasmer/wasi": "^1.2.2",
 		"true-myth": "^7.3.0",
 		"@noble/secp256k1": "2.1.0",
-		"@noble/hashes": "1.4.0"
+		"@noble/hashes": "1.4.0",
+		"@seda-protocol/utils": "../../../seda-explorer/libs/seda-utils/seda-protocol-utils-0.0.1.tgz"
 	}
 }
diff --git a/libs/vm/src/services/try.ts b/libs/vm/src/services/try.ts
diff --git a/libs/vm/src/vm-imports.ts b/libs/vm/src/vm-imports.ts
@@ -1,7 +1,7 @@
 import * as Secp256k1 from "@noble/secp256k1";
+import { trySync } from "@seda-protocol/utils";
 import { Maybe } from "true-myth";
 import { keccak256, secp256k1Verify } from "./services/crypto";
-import { trySync } from "./services/try";
 import { type HttpFetchAction, HttpFetchResponse } from "./types/vm-actions";
 import { PromiseStatus } from "./types/vm-promise";
 import { WorkerToHost } from "./worker-host-communication.js";

diff --git a/package.json b/package.json
@@ -48,16 +48,17 @@
 		"@cosmjs/crypto": "^0.32.4",
 		"@cosmjs/proto-signing": "^0.32.4",
 		"@cosmjs/stargate": "^0.32.4",
+		"@noble/secp256k1": "2.1.0",
+		"@seda-protocol/utils": "../seda-explorer/libs/seda-utils/seda-protocol-utils-0.0.1.tgz",
 		"@types/node-gzip": "^1.1.1",
 		"@wasmer/wasi": "^1.2.2",
+		"as-bignum": "^0.3.1",
 		"big.js": "^6.2.1",
-		"@noble/secp256k1": "2.1.0",
 		"commander": "^11.0.0",
 		"cosmjs-types": "^0.9.0",
 		"dotenv": "^16.3.1",
 		"figlet": "^1.6.0",
 		"json-as": "0.9.6",
-		"as-bignum": "^0.3.1",
 		"node-fetch": "^3.3.2",
 		"node-gzip": "^1.1.2",
 		"ora": "^7.0.1",

diff --git a/tsconfig.base.json b/tsconfig.base.json
@@ -5,7 +5,7 @@
 		"rootDir": ".",
 		"sourceMap": true,
 		"declaration": false,
-		"moduleResolution": "node",
+		"moduleResolution": "bundler",
 		"emitDecoratorMetadata": true,
 		"experimentalDecorators": true,
 		"importHelpers": true,