Merge pull request #39 from setheum-js/2.1.0-dev

2.1.0 dev
setheum-js · Dec 5, 2021 · a6735aa · a6735aa
2 parents b0e94a4 + 8755868
commit a6735aa
Show file tree

Hide file tree

Showing 44 changed files with 8,902 additions and 12,612 deletions.
diff --git a/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs b/.yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
diff --git a/.yarn/plugins/@yarnpkg/plugin-version.cjs b/.yarn/plugins/@yarnpkg/plugin-version.cjs
diff --git a/.yarn/releases/yarn-2.4.2.cjs b/.yarn/releases/yarn-2.4.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
diff --git a/package.json b/package.json
@@ -6,10 +6,10 @@
     "HuangLeiWan. <[email protected]>"
   ],
   "license": "Apache-2",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "private": true,
   "engines": {
-    "yarn": "^1.10.1"
+    "yarn": "^1.22.10"
   },
   "workspaces": [
     "packages/*"

diff --git a/packages/api-derive/package.json b/packages/api-derive/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@setheum.js/api-derive",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Additional polkadot.js derives for Setheum Network",
   "main": "index.js",
   "author": "Setheum Labs",
@@ -15,7 +15,7 @@
   },
   "homepage": "https://github.com/setheum-js/setheum.js",
   "dependencies": {
-    "@setheum.js/types": "2.0.1",
+    "@setheum.js/types": "2.1.0",
     "@babel/runtime": "^7.10.2",
     "@open-web3/orml-types": "^1.0.2-0",
     "@polkadot/api-derive": "^6.3.1"

diff --git a/packages/api-derive/src/loan/loan-type.ts b/packages/api-derive/src/loan/loan-type.ts
@@ -38,7 +38,6 @@ export function loanType(
     ]).pipe(
       map((result) => {
         const constants = loanConstants(api);
-        const [globalInterestRatePerSec, debitExchangeRate, collateralParams] = result;
 
         return {
           currency,

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@setheum.js/api",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Setheum JS API",
   "main": "index.js",
   "author": "Setheum Developers",
@@ -15,8 +15,8 @@
   },
   "homepage": "https://github.com/setheum-js/setheum.js",
   "dependencies": {
-    "@setheum.js/api-derive": "2.0.1",
-    "@setheum.js/types": "2.0.1",
+    "@setheum.js/api-derive": "2.1.0",
+    "@setheum.js/types": "2.1.0",
     "@babel/runtime": "^7.10.2",
     "@open-web3/orml-api-derive": "^1.0.2-0",
     "@polkadot/api": "^6.3.1",

diff --git a/packages/app-util/package.json b/packages/app-util/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@setheum.js/app-util",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Utilities to work with Setheum Network",
   "author": "Setheum Labs",
   "main": "index.js",

diff --git a/packages/sdk-core/package.json b/packages/sdk-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@setheum.js/sdk-core",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "the core of Setheum Network sdk",
   "main": "index.js",
   "author": "Setheum Labs",
@@ -15,8 +15,8 @@
   },
   "homepage": "https://github.com/setheum-js/setheum.js",
   "dependencies": {
-    "@setheum.js/api": "2.0.1",
-    "@setheum.js/type-definitions": "2.0.1",
+    "@setheum.js/api": "2.1.0",
+    "@setheum.js/type-definitions": "2.1.0",
     "@polkadot/api": "^6.3.1",
     "@polkadot/types": "^6.3.1",
     "@types/events": "^3.0.0",

diff --git a/packages/sdk-core/src/token.spec.ts b/packages/sdk-core/src/token.spec.ts
@@ -50,6 +50,5 @@ describe('token', () => {
 
     expect(Token.sort(setm, dnar)).toEqual([setm, dnar]);
     expect(Token.sort(dnar, setm)).toEqual([setm, dnar]);
-    expect(Token.sort(dnar, setusd, setm)).toEqual([setm, setusd, dnar]);
   });
 });
diff --git a/packages/sdk-loan/package.json b/packages/sdk-loan/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@setheum.js/sdk-loan",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "the loan sub module in Setheum Network sdk",
   "main": "index.js",
   "author": "Setheum Labs",
@@ -15,8 +15,8 @@
   },
   "homepage": "https://github.com/setheum-js/setheum.js",
   "dependencies": {
-    "@setheum.js/api-derive": "2.0.1",
-    "@setheum.js/sdk-core": "2.0.1",
+    "@setheum.js/api-derive": "2.1.0",
+    "@setheum.js/sdk-core": "2.1.0",
     "@polkadot/api": "^6.3.1",
     "@polkadot/types": "^6.3.1",
     "lodash": "^4.17.20",

diff --git a/packages/sdk-loan/src/loan.ts b/packages/sdk-loan/src/loan.ts
@@ -43,7 +43,7 @@ export class LoanRx {
 
   constructor(api: ApiRx, currency: MaybeCurrency, address: string, wallet: WalletRx) {
     const collateralToken = wallet.getToken(currency);
-    const stableCoinToken = wallet.getToken(api.consts.cdpEngine.getSetUSDCurrencyId);
+    const stableCoinToken = wallet.getToken(api.consts.cdpEngine.getSetUSDId);
 
     assert(collateralToken && stableCoinToken, `init the loan sdk failed, can't find useable token in currency chain`);
 

diff --git a/packages/sdk-swap/package.json b/packages/sdk-swap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@setheum.js/sdk-swap",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "the swap sub module in Setheum Network sdk",
   "main": "index.js",
   "author": "Setheum Labs",
@@ -15,7 +15,7 @@
   },
   "homepage": "https://github.com/setheum-js/setheum.js",
   "dependencies": {
-    "@setheum.js/sdk-core": "2.0.1",
+    "@setheum.js/sdk-core": "2.1.0",
     "@polkadot/api": "^6.3.1",
     "@polkadot/types": "^6.3.1",
     "lodash": "^4.17.20",

diff --git a/packages/sdk-swap/src/trade-graph.spec.ts b/packages/sdk-swap/src/trade-graph.spec.ts
@@ -6,44 +6,38 @@ describe('trade graph', () => {
   const setusd = new Token('SETUSD');
   const dnar = new Token('DNAR');
   const serp = new Token('SERP');
-  const renbtc = new Token('RENBTC');
+  const setr = new Token('SETR');
 
   test('create trade graph', () => {
     const tradeGraph = new TradeGraph([
       new TokenPair(setm, setusd),
       new TokenPair(setm, dnar),
       new TokenPair(setm, serp),
-      new TokenPair(setm, renbtc),
-      new TokenPair(dnar, renbtc)
+      new TokenPair(setm, setr),
+      new TokenPair(dnar, setr)
     ]);
 
-    expect(tradeGraph.getAdj(setm)).toEqual([setusd, dnar, serp, renbtc]);
+    expect(tradeGraph.getAdj(setm)).toEqual([setusd, dnar, serp, setr]);
     expect(tradeGraph.getAdj(setusd)).toEqual([setm]);
-    expect(tradeGraph.getAdj(renbtc)).toEqual([setm, dnar]);
+    expect(tradeGraph.getAdj(setr)).toEqual([setm, dnar]);
   });
 
   test('get path should be work', () => {
     const tradeGraph = new TradeGraph([
       new TokenPair(setm, setusd),
       new TokenPair(setm, dnar),
       new TokenPair(setm, serp),
-      new TokenPair(setm, renbtc),
-      new TokenPair(dnar, renbtc),
+      new TokenPair(setm, setr),
+      new TokenPair(dnar, setr),
       new TokenPair(dnar, setusd)
     ]);
 
     const _dnar = new Token('DNAR');
 
-    const dnar2renbtc = tradeGraph.getPathes(_dnar, renbtc);
-
-    expect(dnar2renbtc[0]).toEqual([_dnar, setm, renbtc]);
-    expect(dnar2renbtc[1]).toEqual([_dnar, renbtc]);
-    expect(dnar2renbtc[2]).toEqual([_dnar, setusd, setm, renbtc]);
 
     const setm2setusd = tradeGraph.getPathes(setm, setusd);
 
     expect(setm2setusd[0]).toEqual([setm, setusd]);
     expect(setm2setusd[1]).toEqual([setm, dnar, setusd]);
-    expect(setm2setusd[2]).toEqual([setm, renbtc, dnar, setusd]);
   });
 });
diff --git a/packages/sdk-wallet/package.json b/packages/sdk-wallet/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@setheum.js/sdk-wallet",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "the wallet sdk for Setheum network",
   "main": "index.js",
   "author": "Setgheum Labs",
@@ -15,7 +15,7 @@
   },
   "homepage": "https://github.com/setheum-js/setheum.js",
   "dependencies": {
-    "@setheum.js/sdk-core": "2.0.1",
+    "@setheum.js/sdk-core": "2.1.0",
     "@polkadot/api": "^6.3.1",
     "@polkadot/types": "^6.3.1",
     "lodash": "^4.17.20",

diff --git a/packages/sdk-wallet/src/config.ts b/packages/sdk-wallet/src/config.ts
@@ -1 +1 @@
-export const ORACLE_FEEDS_TOKEN = ['SETM', 'SERP', 'DNAR', 'SETR', 'SETUSD', 'RENBTC'];
+export const ORACLE_FEEDS_TOKEN = ['SETM', 'SERP', 'DNAR', 'SETR', 'SETUSD'];
diff --git a/packages/sdk-wallet/src/utils/get-existential-deposit-config.ts b/packages/sdk-wallet/src/utils/get-existential-deposit-config.ts
@@ -13,20 +13,18 @@ type ExistentialDepositConfig = {
 // TODO: Update to match chain impl!
 const EXISTENTIAL_DEPOSIT: ExistentialDepositConfig = {
   setheum: {
-    SETM: new FixedPointNumber(0.1, 12),
-    SERP: new FixedPointNumber(0.01, 12),
-    DNAR: new FixedPointNumber(10 * 0.00001, 12),
-    SETR: new FixedPointNumber(50 * 0.00001, 12),
-    SETUSD: MAX,
-    RENBTC: MAX,
+    SETM: new FixedPointNumber(0.1, 18),
+    SERP: new FixedPointNumber(0.1, 18),
+    DNAR: new FixedPointNumber(0.1, 18),
+    SETR: new FixedPointNumber(0.1, 18),
+    SETUSD: new FixedPointNumber(0.1, 18),
   },
   dev: {
-    SETM: new FixedPointNumber(0.1, 12),
-    SERP: new FixedPointNumber(0.01, 12),
-    DNAR: new FixedPointNumber(10 * 0.00001, 12),
-    SETR: new FixedPointNumber(50 * 0.00001, 12),
-    SETUSD: MAX,
-    RENBTC: MAX,
+    SETM: new FixedPointNumber(0.1, 18),
+    SERP: new FixedPointNumber(0.1, 18),
+    DNAR: new FixedPointNumber(0.1, 18),
+    SETR: new FixedPointNumber(0.1, 18),
+    SETUSD: new FixedPointNumber(0.1, 18),
   }
 };
 

diff --git a/packages/setcloud-pin/package.json b/packages/setcloud-pin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@setheum.js/setcloud-pin",
-  "version": "1.0.0",
+  "version": "2.1.0",
   "description": "Decentralized SetCloud pin on Setheum Network",
   "main": "src/index.js",
   "license": "Apache-2.0",
@@ -19,7 +19,7 @@
     "fix": "gts fix"
   },
   "dependencies": {
-    "@setheum.js/type-definitions": "^2.0.0",
+    "@setheum.js/type-definitions": "^2.1.0",
     "@polkadot/api": "^4.2.1"
   },
   "devDependencies": {

diff --git a/packages/type-definitions/package.json b/packages/type-definitions/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@setheum.js/type-definitions",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "description": "Polkadot.js type definations for Setheum Network",
   "main": "index.js",
   "author": "Setheum Labs",

diff --git a/packages/type-definitions/src/index.ts b/packages/type-definitions/src/index.ts
@@ -16,8 +16,6 @@ import market from './market';
 import staking from './staking';
 import swork from './swork';
 
-// ecosystem
-import renvmBridge from './renvmBridge';
 
 import runtime from './runtime';
 import { signedExtensions as setheumSignedExtensions } from './signedExtensions';
@@ -47,8 +45,6 @@ const setheumDefs = {
   market,
   staking,
   swork,
-  // Bridges
-  renvmBridge,
 };
 
 export const types = {

diff --git a/packages/type-definitions/src/json/types.json b/packages/type-definitions/src/json/types.json
@@ -62,8 +62,7 @@
             "SERP": 1,
             "DNAR": 2,
             "SETR": 3,
-            "SETUSD": 4,
-            "RENBTC": 121
+            "SETUSD": 4
         }
     },
     "DexShare": {
@@ -89,8 +88,7 @@
     "AuthoritysOriginId": {
         "_enum": [
             "Root",
-            "Treasury",
-            "PublicFund"
+            "Treasury"
         ]
     },
     "SetheumDataProviderId": {
@@ -100,7 +98,6 @@
         ]
     },
     "TradingPair": "(CurrencyId,  CurrencyId)",
-    "ChainBridgeChainId": "u8",
     "PalletBalanceOf": "Balance",
     "CollateralAuctionItem": {
         "refundRecipient": "AccountId",
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		export const ORACLE_FEEDS_TOKEN = ['SETM', 'SERP', 'DNAR', 'SETR', 'SETUSD', 'RENBTC'];
		export const ORACLE_FEEDS_TOKEN = ['SETM', 'SERP', 'DNAR', 'SETR', 'SETUSD'];