Skip to content
This repository has been archived by the owner on Jan 24, 2024. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: Zapper-fi/studio
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.41.0
Choose a base ref
...
head repository: Zapper-fi/studio
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v0.42.0
Choose a head ref
  • 4 commits
  • 9 files changed
  • 4 contributors

Commits on May 25, 2022

  1. Copy the full SHA
    ce08a3b View commit details
  2. feat(qi-dao): Add assetStandard to vault dataProps (#506)

    Co-authored-by: immasandwich <[email protected]>
    pwele and immasandwich authored May 25, 2022
    Copy the full SHA
    5a8141e View commit details
  3. Copy the full SHA
    a55cb92 View commit details
  4. Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    b139dc3 View commit details
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -4,6 +4,19 @@

[1]: https://www.npmjs.com/package/@zapper-fi/studio?activeTab=versions

## [0.42.0](https://github.com/Zapper-fi/studio/compare/v0.41.0...v0.42.0) (2022-05-25)


### Features

* **qi-dao:** Add assetStandard to vault dataProps ([#506](https://github.com/Zapper-fi/studio/issues/506)) ([5a8141e](https://github.com/Zapper-fi/studio/commit/5a8141ed41daff9857b9977b12d85e51375bf2cc))


### Bug Fixes

* **codegen:** Add indexes and generate on create app ([#508](https://github.com/Zapper-fi/studio/issues/508)) ([a55cb92](https://github.com/Zapper-fi/studio/commit/a55cb92176b19679952d16265601600fca281d9a))
* **ease:** fix correct apy and images of uTokens ([#505](https://github.com/Zapper-fi/studio/issues/505)) ([ce08a3b](https://github.com/Zapper-fi/studio/commit/ce08a3b5a05e26b46d3fa6fe4050f5540b69b384))

## [0.41.0](https://github.com/Zapper-fi/studio/compare/v0.40.0...v0.41.0) (2022-05-25)


2 changes: 2 additions & 0 deletions cli/commands/create-app.ts
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ import { zipObject } from 'lodash';

import { AppAction } from '../../src/app/app.interface';
import { generateAppDefinition } from '../generators/generate-app-definition';
import { generateAppIndex } from '../generators/generate-app-index';
import { generateAppModule } from '../generators/generate-app-module';
import {
promptAppDescription,
@@ -40,6 +41,7 @@ export default class CreateApp extends Command {
}

await generateAppModule(appId);
await generateAppIndex(appId);
await generateAppDefinition({
id: appId,
name: appName,
21 changes: 21 additions & 0 deletions cli/generators/generate-app-index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import dedent from 'dedent';
import * as recast from 'recast';

import { strings } from '../strings';

import { formatAndWrite } from './utils';

export async function generateAppIndex(appId: string) {
const appDefinitionName = `${strings.upperCase(appId)}_DEFINITION`;
const appClassName = strings.titleCase(appId);

const content = dedent`
export { ${appDefinitionName}, ${appClassName}AppDefinition } from './${appId}.definition';
export { ${appClassName}AppModule } from './${appId}.module';
export { ${appClassName}ContractFactory } from './contracts';
`;

const ast = recast.parse(content, { parser: require('recast/parsers/typescript') });
const prettyContent = recast.prettyPrint(ast).code;
await formatAndWrite(`./src/apps/${appId}/index.ts`, prettyContent);
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@zapper-fi/studio",
"version": "0.41.0",
"version": "0.42.0",
"description": "Community build apps for Zapper.fi",
"license": "MIT",
"main": "./index.js",
4 changes: 1 addition & 3 deletions src/apps/ease/ethereum/ease.rca.token-fetcher.ts
Original file line number Diff line number Diff line change
@@ -4,7 +4,6 @@ import _ from 'lodash';

import { IAppToolkit, APP_TOOLKIT } from '~app-toolkit/app-toolkit.interface';
import { Register } from '~app-toolkit/decorators';
import { getAppImg } from '~app-toolkit/helpers/presentation/image.present';
import { YEARN_DEFINITION } from '~apps/yearn/yearn.definition';
import { PositionFetcher } from '~position/position-fetcher.interface';
import { AppTokenPosition } from '~position/position.interface';
@@ -61,8 +60,7 @@ export class EthereumEaseRcaTokenFetcher implements PositionFetcher<AppTokenPosi
.balanceOf(address)
.then(v => Number(v) / 10 ** underlyingToken.decimals),
resolvePricePerShare: () => 1,
resolveApy: async ({ vaultAddress }) => await (rcaAddressToDetails[vaultAddress]?.token['apy'] ?? 0),
resolveImages: () => [getAppImg(appId)],
resolveApy: async ({ vaultAddress }) => (await (rcaAddressToDetails[vaultAddress]?.token['apy'] ?? 0)) / 100,
});
}
}
4 changes: 3 additions & 1 deletion src/apps/qi-dao/helpers/qi-dao.vault.position-helper.ts
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import { ZERO_ADDRESS } from '~app-toolkit/constants/address';
import { buildDollarDisplayItem } from '~app-toolkit/helpers/presentation/display-item.present';
import { getImagesFromToken, getTokenImg } from '~app-toolkit/helpers/presentation/image.present';
import { ContractType } from '~position/contract.interface';
import { ContractPosition } from '~position/position.interface';
import { ContractPosition, Standard } from '~position/position.interface';
import { AppGroupsDefinition } from '~position/position.service';
import { borrowed, supplied } from '~position/position.utils';
import { Network } from '~types/network.interface';
@@ -15,6 +15,7 @@ import { QiDaoContractFactory } from '../contracts';
import { QI_DAO_DEFINITION } from '../qi-dao.definition';

export type QiDaoVaultPositionDataProps = {
assetStandard: Standard;
liquidity: number;
vaultInfoAddress: string;
};
@@ -83,6 +84,7 @@ export class QiDaoVaultPositionHelper {
tokens,

dataProps: {
assetStandard: Standard.ERC_721,
liquidity,
vaultInfoAddress,
},
2 changes: 2 additions & 0 deletions src/apps/rari-fuse/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { RARI_FUSE_DEFINITION, RariFuseAppDefinition } from './rari-fuse.definition';
export { RariFuseContractFactory } from './contracts';
2 changes: 2 additions & 0 deletions src/apps/saddle/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export { SADDLE_DEFINITION, SaddleAppDefinition } from './saddle.definition';
export { SaddleContractFactory } from './contracts';
6 changes: 6 additions & 0 deletions src/position/position.interface.ts
Original file line number Diff line number Diff line change
@@ -12,6 +12,12 @@ export enum MetaType {
NFT = 'nft',
}

export enum Standard {
ERC_20 = 'erc20',
ERC_721 = 'erc721',
ERC_1155 = 'erc1155',
}

export interface AbstractPosition<T = DefaultDataProps> extends Contract {
tokens: WithMetaType<Token>[];
dataProps: T;