Feat/zapper 2

.github/workflows/publish_oraiswap_v3.yml

@@ -0,0 +1,67 @@
+name: publish_package_oraiswap_v3
+
+# Controls when the action will run.
+on:
+  # Triggers the workflow on push or pull request events but only for the main branch
+  push:
+    branches: [feat/zapper-2]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        node-version: ["18"]
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/[email protected]
+        with:
+          access_token: ${{ github.token }}
+      - uses: actions/checkout@v2
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - uses: actions/cache@v4
+        id: yarn-cache
+        with:
+          path: |
+            ${{ steps.yarn-cache-dir-path.outputs.dir }}
+            ./node_modules/
+          key: ${{ runner.os }}-yarn-${{ hashFiles('./yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - name: Install Dependencies
+        run: yarn
+      - name: Build
+        run: yarn build
+      - name: Authenticate with private NPM package
+        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+      - name: Publish Oraiswap v3
+        id: publish-oraiswap-v3
+        continue-on-error: true
+        run: yarn deploy:beta packages/oraiswap-v3
+        env:
+          CI: false
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Publish Contract SDK
+        id: publish-oraidex-contracts-sdk
+        continue-on-error: true
+        run: yarn deploy:beta packages/contracts-sdk
+        env:
+          CI: false
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - name: Publish Contract Build
+        id: publish-oraidex-contracts-build
+        continue-on-error: true
+        run: yarn deploy:beta packages/contracts-build
+        env:
+          CI: false
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}

packages/contracts-sdk/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oraichain/oraidex-contracts-sdk",
-  "version": "1.0.52",
+  "version": "1.0.53-beta.2",
   "main": "build/index.js",
   "files": [
     "build/",

packages/contracts-sdk/src/IncentivesFundManager.client.ts

@@ -0,0 +1,90 @@
+/**
+* This file was automatically generated by @oraichain/[email protected].
+* DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+* and run the @oraichain/ts-codegen generate command to regenerate this file.
+*/
+
+import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
+import { Coin, StdFee } from "@cosmjs/amino";
+import {Addr, InstantiateMsg, ExecuteMsg, Uint128, AssetInfo, Asset, QueryMsg, MigrateMsg, ConfigResponse} from "./IncentivesFundManager.types";
+export interface IncentivesFundManagerReadOnlyInterface {
+  contractAddress: string;
+  config: () => Promise<ConfigResponse>;
+}
+export class IncentivesFundManagerQueryClient implements IncentivesFundManagerReadOnlyInterface {
+  client: CosmWasmClient;
+  contractAddress: string;
+
+  constructor(client: CosmWasmClient, contractAddress: string) {
+    this.client = client;
+    this.contractAddress = contractAddress;
+    this.config = this.config.bind(this);
+  }
+
+  config = async (): Promise<ConfigResponse> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      config: {}
+    });
+  };
+}
+export interface IncentivesFundManagerInterface extends IncentivesFundManagerReadOnlyInterface {
+  contractAddress: string;
+  sender: string;
+  updateConfig: ({
+    oraiswapV3,
+    owner
+  }: {
+    oraiswapV3?: Addr;
+    owner?: Addr;
+  }, _fee?: number | StdFee | "auto", _memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+  sendFund: ({
+    asset,
+    receiver
+  }: {
+    asset: Asset;
+    receiver: Addr;
+  }, _fee?: number | StdFee | "auto", _memo?: string, _funds?: Coin[]) => Promise<ExecuteResult>;
+}
+export class IncentivesFundManagerClient extends IncentivesFundManagerQueryClient implements IncentivesFundManagerInterface {
+  client: SigningCosmWasmClient;
+  sender: string;
+  contractAddress: string;
+
+  constructor(client: SigningCosmWasmClient, sender: string, contractAddress: string) {
+    super(client, contractAddress);
+    this.client = client;
+    this.sender = sender;
+    this.contractAddress = contractAddress;
+    this.updateConfig = this.updateConfig.bind(this);
+    this.sendFund = this.sendFund.bind(this);
+  }
+
+  updateConfig = async ({
+    oraiswapV3,
+    owner
+  }: {
+    oraiswapV3?: Addr;
+    owner?: Addr;
+  }, _fee: number | StdFee | "auto" = "auto", _memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      update_config: {
+        oraiswap_v3: oraiswapV3,
+        owner
+      }
+    }, _fee, _memo, _funds);
+  };
+  sendFund = async ({
+    asset,
+    receiver
+  }: {
+    asset: Asset;
+    receiver: Addr;
+  }, _fee: number | StdFee | "auto" = "auto", _memo?: string, _funds?: Coin[]): Promise<ExecuteResult> => {
+    return await this.client.execute(this.sender, this.contractAddress, {
+      send_fund: {
+        asset,
+        receiver
+      }
+    }, _fee, _memo, _funds);
+  };
+}

packages/contracts-sdk/src/IncentivesFundManager.types.ts

@@ -0,0 +1,38 @@
+export type Addr = string;
+export interface InstantiateMsg {
+  oraiswap_v3: Addr;
+  owner?: Addr | null;
+}
+export type ExecuteMsg = {
+  update_config: {
+    oraiswap_v3?: Addr | null;
+    owner?: Addr | null;
+  };
+} | {
+  send_fund: {
+    asset: Asset;
+    receiver: Addr;
+  };
+};
+export type Uint128 = string;
+export type AssetInfo = {
+  token: {
+    contract_addr: Addr;
+  };
+} | {
+  native_token: {
+    denom: string;
+  };
+};
+export interface Asset {
+  amount: Uint128;
+  info: AssetInfo;
+}
+export type QueryMsg = {
+  config: {};
+};
+export interface MigrateMsg {}
+export interface ConfigResponse {
+  oraiswap_v3: Addr;
+  owner: Addr;
+}

packages/contracts-sdk/src/OraiswapV3.client.ts

@@ -6,11 +6,12 @@
 
 import { CosmWasmClient, SigningCosmWasmClient, ExecuteResult } from "@cosmjs/cosmwasm-stargate";
 import { Coin, StdFee } from "@cosmjs/amino";
-import {Percentage, InstantiateMsg, ExecuteMsg, Addr, Liquidity, SqrtPrice, TokenAmount, Binary, Expiration, Timestamp, Uint64, AssetInfo, PoolKey, FeeTier, SwapHop, NftExtensionMsg, QueryMsg, MigrateMsg, FeeGrowth, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponse, Position, PositionIncentives, ArrayOfPosition, TokensResponse, ApprovedForAllResponse, Boolean, ArrayOfFeeTier, ArrayOfLiquidityTick, LiquidityTick, Uint32, NumTokensResponse, Pool, IncentiveRecord, ArrayOfPoolWithPoolKey, PoolWithPoolKey, Uint128, ArrayOfAsset, Asset, ArrayOfPositionTick, PositionTick, QuoteResult, Tick, TickIncentive, ArrayOfTupleOfUint16AndUint64} from "./OraiswapV3.types";
+import {Addr, Percentage, InstantiateMsg, ExecuteMsg, Liquidity, SqrtPrice, TokenAmount, Binary, Expiration, Timestamp, Uint64, AssetInfo, PoolKey, FeeTier, SwapHop, NftExtensionMsg, QueryMsg, MigrateMsg, FeeGrowth, AllNftInfoResponse, OwnerOfResponse, Approval, NftInfoResponse, Position, PositionIncentives, ArrayOfPosition, TokensResponse, ApprovedForAllResponse, Boolean, ArrayOfFeeTier, ArrayOfLiquidityTick, LiquidityTick, Uint32, NumTokensResponse, Pool, IncentiveRecord, ArrayOfPoolWithPoolKey, PoolWithPoolKey, Uint128, ArrayOfAsset, Asset, ArrayOfPositionTick, PositionTick, QuoteResult, Tick, TickIncentive, ArrayOfTupleOfUint16AndUint64} from "./OraiswapV3.types";
 export interface OraiswapV3ReadOnlyInterface {
   contractAddress: string;
   admin: () => Promise<Addr>;
   protocolFee: () => Promise<Percentage>;
+  incentivesFundManager: () => Promise<Addr>;
   position: ({
     index,
     ownerId
@@ -205,6 +206,7 @@ export class OraiswapV3QueryClient implements OraiswapV3ReadOnlyInterface {
     this.contractAddress = contractAddress;
     this.admin = this.admin.bind(this);
     this.protocolFee = this.protocolFee.bind(this);
+    this.incentivesFundManager = this.incentivesFundManager.bind(this);
     this.position = this.position.bind(this);
     this.positions = this.positions.bind(this);
     this.allPosition = this.allPosition.bind(this);
@@ -243,6 +245,11 @@ export class OraiswapV3QueryClient implements OraiswapV3ReadOnlyInterface {
       protocol_fee: {}
     });
   };
+  incentivesFundManager = async (): Promise<Addr> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      incentives_fund_manager: {}
+    });
+  };
   position = async ({
     index,
     ownerId

packages/contracts-sdk/src/OraiswapV3.types.ts

@@ -1,5 +1,7 @@
+export type Addr = string;
 export type Percentage = number;
 export interface InstantiateMsg {
+  incentives_fund_manager: Addr;
   protocol_fee: Percentage;
 }
 export type ExecuteMsg = {
@@ -132,7 +134,6 @@ export type ExecuteMsg = {
     index: number;
   };
 };
-export type Addr = string;
 export type Liquidity = string;
 export type SqrtPrice = string;
 export type TokenAmount = string;
@@ -180,6 +181,8 @@ export type QueryMsg = {
   admin: {};
 } | {
   protocol_fee: {};
+} | {
+  incentives_fund_manager: {};
 } | {
   position: {
     index: number;

packages/contracts-sdk/src/index.ts

@@ -32,4 +32,6 @@ export * as OraiswapMixedRouterTypes from "./OraiswapMixedRouter.types";
 export * from "./OraiswapMixedRouter.client";
 export * as ZapperTypes from "./Zapper.types";
 export * from "./Zapper.client";
+export * as IncentivesFundManagerTypes from "./IncentivesFundManager.types";
+export * from "./IncentivesFundManager.client";
 export * from "./types";

packages/oraiswap-v3/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oraichain/oraiswap-v3",
-  "version": "0.1.20",
+  "version": "0.1.20-beta.1",
   "main": "build/index.js",
   "files": [
     "build/"
@@ -12,7 +12,7 @@
   "license": "MIT",
   "dependencies": {
     "@cosmjs/cosmwasm-stargate": "^0.31.0",
-    "@oraichain/oraidex-contracts-sdk": "^1.0.52",
+    "@oraichain/oraidex-contracts-sdk": "1.0.53-beta.2",
     "@oraichain/oraidex-common": "^1.1.21"
   }
 }

packages/oraiswap-v3/src/error.ts

@@ -2,4 +2,16 @@ export class RouteNotFoundError extends Error {
   constructor(route: string) {
     super(`Route not found: ${route}`);
   }
+}
+
+export class RouteNoLiquidity extends Error {
+  constructor() {
+    super(`Route has no liquidity`);
+  }
+}
+
+export class SpamTooManyRequestsError extends Error {
+  constructor() {
+    super(`Too many requests`);
+  }
 }