Skip to content

Commit

Permalink
refactor: separate into monorepo
Browse files Browse the repository at this point in the history
  • Loading branch information
yoosoftcc committed Dec 24, 2023
1 parent b5deb17 commit 9cf5c27
Show file tree
Hide file tree
Showing 28 changed files with 582 additions and 4,400 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,3 @@ secret.*
*/**/*.js.map
*/**/*.d.ts
*/**/*.d.ts.map
*/**/*.json
40 changes: 3 additions & 37 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,39 +1,5 @@
{
"name": "onescription",
"version": "0.1.24",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"files": [
"lib/*"
],
"scripts": {
"build": "tsc",
"generate-types": "typechain --target ethers-v5 --out-dir src/typechain 'src/abi/*.json'"
},
"license": "MIT",
"dependencies": {
"@cosmjs/launchpad": "^0.27.1",
"@cosmjs/stargate": "^0.32.1",
"@injectivelabs/networks": "^1.14.4",
"@injectivelabs/sdk-ts": "^1.14.4",
"@injectivelabs/utils": "^1.14.4",
"@injectivelabs/wallet-ts": "^1.14.4",
"age-encryption": "^0.1.5",
"async-mutex": "^0.4.0",
"csv": "^6.3.6",
"ethers": "5.7.2",
"grpc-web": "^1.5.0",
"ts-node": "^10.9.1",
"ts-pattern": "^5.0.6"
},
"overrides": {
"axios": "^1.6.2"
},
"resolutions": {
"axios": "^1.6.2"
},
"devDependencies": {
"@types/node": "^20.10.4",
"typescript": "^5.3.2"
}
"private": "true",
"workspaces":["packages/*"],
"license": "MIT"
}
3 changes: 3 additions & 0 deletions packages/cosmos/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
secret.*
lib
33 changes: 33 additions & 0 deletions packages/cosmos/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"name": "@scriptione/cosmos",
"version": "0.0.3",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"files": [
"lib/*"
],
"author": {
"name": "amovane"
},
"repository": {
"url": "https://github.com/amovane/onescription"
},
"license": "MIT",
"scripts": {
"build": "tsc"
},
"dependencies": {
"@cosmjs/amino": "^0.32.2",
"@cosmjs/launchpad": "^0.27.1",
"@cosmjs/stargate": "^0.32.1",
"@injectivelabs/networks": "^1.14.4",
"@injectivelabs/sdk-ts": "^1.14.4",
"@injectivelabs/utils": "^1.14.4",
"@scriptione/one": "0.0.2",
"ts-pattern": "^5.0.6"
},
"devDependencies": {
"@types/node": "^20.10.4",
"typescript": "^5.3.2"
}
}
File renamed without changes.
19 changes: 9 additions & 10 deletions src/inscriber/cosmos.ts → packages/cosmos/src/cosmos.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { BigNumber, ethers } from "ethers";
import { CHAINS_COSMOS } from "../chains";
import { CosmosConfig, Defferable, Inscriber, Inscription, Tx, TxRequest } from "./inscriber";
import { Defferable, Inscriber, Inscription, Tx, TxRequest } from "@scriptione/one";
import { appendFileSync } from "fs";
import { Secp256k1HdWallet } from "@cosmjs/launchpad";
import { SigningStargateClient, StargateClient } from "@cosmjs/stargate";
import assert from "assert";
import { CHAINS, CosmosConfig } from ".";

export class CosmosInscriber extends Inscriber {
constructor(config: CosmosConfig) {
super(config);
this.rpcs = CHAINS_COSMOS[config.prefix]?.rpcs ?? [];
this.rpcs = CHAINS[config.prefix]?.rpcs ?? [];
}

inscribe(inp: Inscription): Promise<Tx> {
Expand All @@ -22,7 +21,7 @@ export class CosmosInscriber extends Inscriber {
return this.signer.getAddress()
.then((from) => {
const to = this.config.isSelfTransaction ? from : this.config.contract!;
const value = this.config.value || BigNumber.from(0);
const value = this.config.value || 0;
return { from, to, data, value }
})
.then((txRequest) => this.signer?.sendTransaction(txRequest))
Expand All @@ -36,12 +35,12 @@ export class CosmosInscriber extends Inscriber {
return Buffer.from(this.stringify(inp)).toString('base64');
}

createSigner(): Defferable<this> {
const signer = ethers.Wallet.createRandom();
const { address, privateKey } = signer;
const record = `${address}${this.csvDelimiter}${privateKey}\r\n`;
async createSigner(): Promise<this> {
const wallet = await Secp256k1HdWallet.generate(undefined, { prefix: (this.config as CosmosConfig).prefix });
const [{ address }] = await wallet.getAccounts();
const record = `${address}${this.csvDelimiter}${wallet.mnemonic}\n`;
appendFileSync(this.secretPath, record);
this.signer = signer;
this.connectSignerFromMnemonic(wallet.mnemonic);
return this;
}

Expand Down
20 changes: 20 additions & 0 deletions packages/cosmos/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
export * from './cosmos';
export * from './injective';
export * from '@scriptione/one';

import { match } from 'ts-pattern';
import { Config } from '@scriptione/one';
import { CosmosInscriber } from './cosmos';
import { InjectiveInscriber } from './injective';
import * as JSON_OBJECT from './chains.json';

export type CosmosConfig = Config & { prefix: string };
export const CHAINS: Record<string, { name: string; rpcs: string[] }> = JSON_OBJECT;
export namespace Inscriber {
export function from(config: CosmosConfig) {
return match(config)
.with({ os: "cosmos", prefix: "inj" }, () => new InjectiveInscriber(config as CosmosConfig))
.with({ os: "cosmos" }, () => new CosmosInscriber(config as CosmosConfig))
.run();
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { CosmosConfig, TxRequest } from "./inscriber";
import { TxRequest } from "@scriptione/one";
import { BaseAccount, ChainRestAuthApi, MsgSend, PrivateKey, TxGrpcClient, createTransaction } from "@injectivelabs/sdk-ts";
import { Network, getNetworkInfo } from "@injectivelabs/networks";
import { CosmosInscriber } from "./cosmos";
import { StdFee } from "@cosmjs/amino";
import { BigNumberInWei } from "@injectivelabs/utils";
import { CosmosConfig } from ".";

export class InjectiveInscriber extends CosmosInscriber {
GAS_ADJUSTMENT = 1.1;
Expand Down
File renamed without changes.
3 changes: 3 additions & 0 deletions packages/evm/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
secret.*
lib
27 changes: 27 additions & 0 deletions packages/evm/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "@scriptione/evm",
"version": "0.0.3",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"files": [
"lib/*"
],
"author": {
"name": "amovane"
},
"repository": {
"url": "https://github.com/amovane/onescription"
},
"license": "MIT",
"scripts": {
"build": "tsc"
},
"dependencies": {
"@scriptione/one": "0.0.2",
"ethers": "5.7.2"
},
"devDependencies": {
"@types/node": "^20.10.4",
"typescript": "^5.3.2"
}
}
File renamed without changes.
6 changes: 3 additions & 3 deletions src/inscriber/evm.ts → packages/evm/src/evm.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { BigNumber, ethers } from "ethers";
import { CHAINS_EVM } from "../chains";
import { Defferable, EvmConfig, Inscriber, Inscription, Provider, Tx } from "./inscriber";
import { Defferable, Inscriber, Inscription, Provider, Tx } from "@scriptione/one";
import { appendFileSync } from "fs";
import assert from "assert";
import { CHAINS, EvmConfig } from ".";

export class EvmInscriber extends Inscriber {
constructor(config: EvmConfig) {
super(config);
this.rpcs = CHAINS_EVM[`${config.chainId}`]?.rpcs ?? [];
this.rpcs = CHAINS[`${config.chainId}`]?.rpcs ?? [];
}

async inscribe(inp: Inscription): Promise<Tx> {
Expand Down
17 changes: 17 additions & 0 deletions packages/evm/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
export * from './evm';
export * from '@scriptione/one';

import { ChainId, Config } from '@scriptione/one';
import { match } from 'ts-pattern';
import { EvmInscriber } from './evm';
import * as JSON_OBJECT from './chains.json';

export type EvmConfig = Config & { chainId: ChainId };
export const CHAINS: Record<string, { name: string; rpcs: string[] }> = JSON_OBJECT;
export namespace Inscriber {
export function from(config: EvmConfig) {
return match(config)
.with({ os: "evm" }, () => new EvmInscriber(config as EvmConfig))
.run();
}
}
104 changes: 104 additions & 0 deletions packages/evm/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig to read more about this file */
/* Projects */
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
/* Language and Environment */
"target": "ESNext", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
// "jsx": "preserve", /* Specify what JSX code is generated. */
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
/* Modules */
"module": "commonjs", /* Specify what module code is generated. */
// "rootDir": "./", /* Specify the root folder within your source files. */
// "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
// "resolveJsonModule": true, /* Enable importing .json files. */
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
/* Emit */
// "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */
// "declarationMap": true, /* Create sourcemaps for d.ts files. */
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
// "sourceMap": true, /* Create source map files for emitted JavaScript files. */
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
// "outDir": "./", /* Specify an output folder for all emitted files. */
// "removeComments": true, /* Disable emitting comments. */
// "noEmit": true, /* Disable emitting files from a compilation. */
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
/* Interop Constraints */
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
// "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */
"esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */
/* Type Checking */
"strict": true, /* Enable all strict type-checking options. */
"preserveConstEnums": true,
"removeComments": false,
"resolveJsonModule": true,
"sourceMap": true,
"moduleResolution": "node",
// "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
// "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
"noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */
// "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
"noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true, /* Skip type checking all .d.ts files. */
"declaration": true,
"declarationMap": true,
"outDir": "lib",
"typeRoots": ["./node_modules/@types"]
}
}
Binary file added packages/one/.DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions packages/one/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
secret.*
lib
29 changes: 29 additions & 0 deletions packages/one/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"name": "@scriptione/one",
"version": "0.0.3",
"main": "lib/index.js",
"types": "lib/index.d.ts",
"files": [
"lib/*"
],
"author": {
"name": "amovane"
},
"repository": {
"url": "https://github.com/amovane/onescription"
},
"license": "MIT",
"scripts": {
"build": "tsc"
},
"dependencies": {
"csv": "^6.3.6",
"ethers": "5.7.2",
"age-encryption": "^0.1.5",
"async-mutex": "^0.4.0"
},
"devDependencies": {
"@types/node": "^20.10.4",
"typescript": "^5.3.2"
}
}
2 changes: 2 additions & 0 deletions packages/one/src/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from "./inscriber";
export * from "./onescription";
2 changes: 0 additions & 2 deletions src/inscriber/inscriber.ts → packages/one/src/inscriber.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ export type Config = {
}

// Currently support evm & cosmos
export type EvmConfig = Config & { chainId: ChainId };
export type CosmosConfig = Config & { prefix: string };

/**
* on-chain Transaction
Expand Down
3 changes: 1 addition & 2 deletions src/onescription.ts → packages/one/src/onescription.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Inscription, InscriptionText, Tx } from "./inscriber";
import { Inscription, InscriptionText, Tx, ChainInfoProvider, Inscriber } from "./inscriber";
import { Semaphore } from 'async-mutex';
import { delay } from "./utils";
import { match } from 'ts-pattern';
import { ChainInfoProvider, Inscriber } from "./inscriber/inscriber";

export type Strategy = {
maxConcurrentRequests?: number;
Expand Down
File renamed without changes.
Loading

0 comments on commit 9cf5c27

Please sign in to comment.