Skip to content

Commit

Permalink
Merge pull request #4 from oraichain/feat/oraidex-info
Browse files Browse the repository at this point in the history
Feat/oraidex info
  • Loading branch information
ducphamle2 authored Jul 20, 2023
2 parents d06533e + 4dcf692 commit 6031dfa
Show file tree
Hide file tree
Showing 38 changed files with 5,183 additions and 64 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ typings/
.env

.npmrc
build
build
*oraidex-sync-data*
7 changes: 7 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"prettier.singleQuote": false,
"prettier.trailingComma": "none",
"prettier.jsxSingleQuote": false,
"prettier.printWidth": 120,
"typescript.tsdk": "node_modules/typescript/lib"
}
5 changes: 5 additions & 0 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
/** @type {import('ts-jest').JestConfigWithTsJest} */
module.exports = {
preset: 'ts-jest',
testEnvironment: 'node',
};
18 changes: 12 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,12 @@
"license": "MIT",
"scripts": {
"postinstall": "patch-package",
"test": "jest",
"docs": "typedoc --entryPointStrategy expand --name 'Oraidex SDK' --readme none --tsconfig packages/contracts-sdk/tsconfig.json packages/contracts-sdk/src",
"build": "tsc -p",
"deploy": "yarn publish --access public --patch"
"deploy": "yarn publish --access public --patch",
"start:server": "yarn build packages/oraidex-sync/ && npx ts-node packages/oraidex-server/src/index.ts"

},
"workspaces": [
"packages/*"
Expand All @@ -15,17 +18,20 @@
"node": ">=16 <=18"
},
"dependencies": {
"@cosmjs/amino": "^0.29.5",
"@cosmjs/cosmwasm-stargate": "^0.29.5",
"@cosmjs/crypto": "^0.29.5",
"@cosmjs/proto-signing": "^0.29.5",
"@cosmjs/stargate": "^0.29.5"
"@cosmjs/amino": "^0.31.0",
"@cosmjs/cosmwasm-stargate": "^0.31.0",
"@cosmjs/crypto": "^0.31.0",
"@cosmjs/proto-signing": "^0.31.0",
"@cosmjs/stargate": "^0.31.0"
},
"devDependencies": {
"@terran-one/cw-simulate": "https://github.com/oraichain/cw-simulate.git",
"@types/jest": "^29.5.2",
"@types/node": "^18.15.8",
"jest": "^29.5.0",
"lerna": "^5.6.1",
"patch-package": "^7.0.0",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"typedoc": "^0.24.7",
"typescript": "^4.8.3"
Expand Down
Binary file modified packages/contracts-build/data/oraiswap_converter.wasm
Binary file not shown.
Binary file modified packages/contracts-build/data/oraiswap_factory.wasm
Binary file not shown.
Binary file modified packages/contracts-build/data/oraiswap_limit_order.wasm
Binary file not shown.
Binary file modified packages/contracts-build/data/oraiswap_pair.wasm
Binary file not shown.
Binary file modified packages/contracts-build/data/oraiswap_staking.wasm
Binary file not shown.
29 changes: 28 additions & 1 deletion packages/contracts-sdk/src/OraiswapFactory.client.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
import { Coin, StdFee } from "@cosmjs/amino";
import {Addr, AssetInfo, PairInfo} from "./types";
import {Addr, AssetInfo, Binary, PairInfo} from "./types";
import {InstantiateMsg, ExecuteMsg, QueryMsg, MigrateMsg, ConfigResponse, PairsResponse} from "./OraiswapFactory.types";
export interface OraiswapFactoryReadOnlyInterface {
contractAddress: string;
Expand Down Expand Up @@ -91,6 +91,15 @@ export interface OraiswapFactoryInterface extends OraiswapFactoryReadOnlyInterfa
}: {
pairInfo: PairInfo;
}, $fee?: number | StdFee | "auto", $memo?: string, $funds?: Coin[]) => Promise<ExecuteResult>;
migrateContract: ({
contractAddr,
msg,
newCodeId
}: {
contractAddr: string;
msg: Binary;
newCodeId: number;
}, $fee?: number | StdFee | "auto", $memo?: string, $funds?: Coin[]) => Promise<ExecuteResult>;
}
export class OraiswapFactoryClient extends OraiswapFactoryQueryClient implements OraiswapFactoryInterface {
client: SigningCosmWasmClient;
Expand All @@ -105,6 +114,7 @@ export class OraiswapFactoryClient extends OraiswapFactoryQueryClient implements
this.updateConfig = this.updateConfig.bind(this);
this.createPair = this.createPair.bind(this);
this.addPair = this.addPair.bind(this);
this.migrateContract = this.migrateContract.bind(this);
}

updateConfig = async ({
Expand Down Expand Up @@ -149,4 +159,21 @@ export class OraiswapFactoryClient extends OraiswapFactoryQueryClient implements
}
}, $fee, $memo, $funds);
};
migrateContract = async ({
contractAddr,
msg,
newCodeId
}: {
contractAddr: string;
msg: Binary;
newCodeId: number;
}, $fee: number | StdFee | "auto" = "auto", $memo?: string, $funds?: Coin[]): Promise<ExecuteResult> => {
return await this.client.execute(this.sender, this.contractAddress, {
migrate_contract: {
contract_addr: contractAddr,
msg,
new_code_id: newCodeId
}
}, $fee, $memo, $funds);
};
}
8 changes: 7 additions & 1 deletion packages/contracts-sdk/src/OraiswapFactory.types.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Addr, AssetInfo, PairInfo} from "./types";
import {Addr, AssetInfo, Binary, PairInfo} from "./types";
export interface InstantiateMsg {
commission_rate?: string | null;
oracle_addr: Addr;
Expand All @@ -20,6 +20,12 @@ export type ExecuteMsg = {
add_pair: {
pair_info: PairInfo;
};
} | {
migrate_contract: {
contract_addr: string;
msg: Binary;
new_code_id: number;
};
};
export type QueryMsg = {
config: {};
Expand Down
2 changes: 1 addition & 1 deletion packages/contracts-sdk/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ export interface PairInfo {
liquidity_token: Addr;
oracle_addr: Addr;
}
export type OrderDirection = "buy" | "sell";
export interface Asset {
amount: Uint128;
info: AssetInfo;
}
export type OrderDirection = "buy" | "sell";
export type OrderFilter = ("tick" | "none") | {
bidder: string;
} | {
Expand Down
3 changes: 3 additions & 0 deletions packages/oraidex-server/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
PORT=2024
RPC_URL=https://rpc.orai,io
DUCKDB_PROD_FILENAME="oraidex-sync-data"
26 changes: 26 additions & 0 deletions packages/oraidex-server/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "@oraichain/oraidex-server",
"version": "1.0.0",
"main": "build/index.js",
"license": "MIT",
"files": [
"build/"
],
"scripts": {
"start": "npx ts-node src/index.ts"
},
"dependencies": {
"@cosmjs/cosmwasm-stargate": "^0.31.0",
"@cosmjs/stargate": "^0.31.0",
"@oraichain/common-contracts-sdk": "1.0.13",
"@cosmjs/tendermint-rpc": "^0.31.0",
"@oraichain/cosmos-rpc-sync": "^1.0.5",
"@oraichain/oraidex-sync": "1.0.0",
"cors": "^2.8.5",
"express": "^4.18.2"
},
"devDependencies": {
"@types/cors": "^2.8.13",
"@types/express": "^4.17.17"
}
}
9 changes: 9 additions & 0 deletions packages/oraidex-server/src/helper.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
export function parseSymbolsToTickerId(symbols: [string, string]) {
return `${symbols[0]}_${symbols[1]}`;
}

export function getDate24hBeforeNow(time: Date) {
const twentyFourHoursInMilliseconds = 24 * 60 * 60 * 1000; // 24 hours in milliseconds
const date24hBeforeNow = new Date(time.getTime() - twentyFourHoursInMilliseconds);
return date24hBeforeNow;
}
Loading

0 comments on commit 6031dfa

Please sign in to comment.