@wildcatfi/wildcat-sdk 1.0.7 → 1.0.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/account.d.ts +28 -1
- package/dist/account.d.ts.map +1 -1
- package/dist/account.js +97 -1
- package/dist/account.js.map +1 -1
- package/dist/constants.d.ts +3 -3
- package/dist/constants.js +3 -3
- package/dist/controller.d.ts +2 -1
- package/dist/controller.d.ts.map +1 -1
- package/dist/controller.js +7 -5
- package/dist/controller.js.map +1 -1
- package/dist/factory.d.ts +3 -2
- package/dist/factory.d.ts.map +1 -1
- package/dist/factory.js +12 -4
- package/dist/factory.js.map +1 -1
- package/dist/index.d.ts +10 -7
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -34
- package/dist/index.js.map +1 -1
- package/dist/misc.d.ts +1 -0
- package/dist/misc.d.ts.map +1 -1
- package/dist/mockerc20factory.d.ts +2 -1
- package/dist/mockerc20factory.d.ts.map +1 -1
- package/dist/mockerc20factory.js +4 -0
- package/dist/mockerc20factory.js.map +1 -1
- package/dist/token.d.ts +3 -2
- package/dist/token.d.ts.map +1 -1
- package/dist/token.js +13 -3
- package/dist/token.js.map +1 -1
- package/dist/typechain/VaultLens.d.ts +147 -24
- package/dist/typechain/VaultLens.d.ts.map +1 -1
- package/dist/typechain/WildcatVaultController.d.ts +27 -27
- package/dist/typechain/WildcatVaultController.d.ts.map +1 -1
- package/dist/typechain/WildcatVaultFactory.d.ts +30 -6
- package/dist/typechain/WildcatVaultFactory.d.ts.map +1 -1
- package/dist/typechain/WildcatVaultToken.d.ts +130 -33
- package/dist/typechain/WildcatVaultToken.d.ts.map +1 -1
- package/dist/typechain/factories/IERC20__factory.d.ts +16 -10
- package/dist/typechain/factories/IERC20__factory.d.ts.map +1 -1
- package/dist/typechain/factories/IERC20__factory.js +17 -10
- package/dist/typechain/factories/IERC20__factory.js.map +1 -1
- package/dist/typechain/factories/VaultLens__factory.d.ts +1197 -82
- package/dist/typechain/factories/VaultLens__factory.d.ts.map +1 -1
- package/dist/typechain/factories/VaultLens__factory.js +1565 -145
- package/dist/typechain/factories/VaultLens__factory.js.map +1 -1
- package/dist/typechain/factories/WildcatVaultController__factory.d.ts +25 -50
- package/dist/typechain/factories/WildcatVaultController__factory.d.ts.map +1 -1
- package/dist/typechain/factories/WildcatVaultController__factory.js +29 -68
- package/dist/typechain/factories/WildcatVaultController__factory.js.map +1 -1
- package/dist/typechain/factories/WildcatVaultFactory__factory.d.ts +50 -21
- package/dist/typechain/factories/WildcatVaultFactory__factory.d.ts.map +1 -1
- package/dist/typechain/factories/WildcatVaultFactory__factory.js +64 -31
- package/dist/typechain/factories/WildcatVaultFactory__factory.js.map +1 -1
- package/dist/typechain/factories/WildcatVaultToken__factory.d.ts +113 -38
- package/dist/typechain/factories/WildcatVaultToken__factory.d.ts.map +1 -1
- package/dist/typechain/factories/WildcatVaultToken__factory.js +138 -48
- package/dist/typechain/factories/WildcatVaultToken__factory.js.map +1 -1
- package/dist/typechain/factories/index.d.ts +2 -3
- package/dist/typechain/factories/index.d.ts.map +1 -1
- package/dist/typechain/factories/index.js +7 -6
- package/dist/typechain/factories/index.js.map +1 -1
- package/dist/typechain/factories/mock/MockERC20Factory__factory.d.ts +1 -1
- package/dist/typechain/factories/mock/MockERC20Factory__factory.d.ts.map +1 -1
- package/dist/typechain/factories/mock/MockERC20Factory__factory.js +1 -1
- package/dist/typechain/factories/mock/MockERC20Factory__factory.js.map +1 -1
- package/dist/typechain/factories/mock/MockERC20__factory.d.ts +11 -1
- package/dist/typechain/factories/mock/MockERC20__factory.d.ts.map +1 -1
- package/dist/typechain/factories/mock/MockERC20__factory.js +14 -1
- package/dist/typechain/factories/mock/MockERC20__factory.js.map +1 -1
- package/dist/typechain/index.d.ts +1 -1
- package/dist/typechain/index.d.ts.map +1 -1
- package/dist/vault.d.ts +17 -2
- package/dist/vault.d.ts.map +1 -1
- package/dist/vault.js +43 -3
- package/dist/vault.js.map +1 -1
- package/package.json +1 -3
- package/dist/typechain/factories/DebtTokenBase__factory.d.ts +0 -660
- package/dist/typechain/factories/DebtTokenBase__factory.d.ts.map +0 -1
- package/dist/typechain/factories/DebtTokenBase__factory.js +0 -867
- package/dist/typechain/factories/DebtTokenBase__factory.js.map +0 -1
package/dist/account.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { BigNumber, ContractTransaction } from "ethers";
|
|
2
2
|
import { TokenAmount } from "./token";
|
|
3
3
|
import { Vault } from "./vault";
|
|
4
|
-
import { AccountVaultInfoStructOutput } from "./typechain";
|
|
4
|
+
import { AccountVaultInfoStructOutput, VaultDataWithAccountStructOutput } from "./typechain";
|
|
5
|
+
import { SignerOrProvider } from "./types";
|
|
5
6
|
export type DepositStatus = {
|
|
6
7
|
status: "InsufficientBalance";
|
|
7
8
|
} | {
|
|
@@ -35,6 +36,9 @@ export declare class VaultAccount {
|
|
|
35
36
|
approveAllowanceRemainder(amount: TokenAmount): Promise<ContractTransaction>;
|
|
36
37
|
deposit(amount: TokenAmount): Promise<ContractTransaction>;
|
|
37
38
|
withdraw(amount: TokenAmount): Promise<ContractTransaction>;
|
|
39
|
+
repay(amount: BigNumber): Promise<ContractTransaction>;
|
|
40
|
+
repayOutstandingDebt(): Promise<ContractTransaction>;
|
|
41
|
+
repayDelinquentDebt(): Promise<ContractTransaction>;
|
|
38
42
|
/**
|
|
39
43
|
* @returns Amount of underlying token borrower can borrow
|
|
40
44
|
*/
|
|
@@ -72,5 +76,28 @@ export declare class VaultAccount {
|
|
|
72
76
|
*/
|
|
73
77
|
checkDepositStep(amount: TokenAmount): DepositStatus;
|
|
74
78
|
static fromAccountVaultInfoStruct(account: string, info: AccountVaultInfoStructOutput, vault: Vault): VaultAccount;
|
|
79
|
+
static fromVaultDataWithAccountStruct(provider: SignerOrProvider, account: string, info: VaultDataWithAccountStructOutput): VaultAccount;
|
|
80
|
+
/**
|
|
81
|
+
* Get a `VaultAccount` for a given account and existing `Vault` instance.
|
|
82
|
+
* If `vault` is a string, the vault data will be fetched in the same call as the account data.
|
|
83
|
+
*/
|
|
84
|
+
static getVaultAccount(provider: SignerOrProvider, account: string, vault: Vault | string): Promise<VaultAccount>;
|
|
85
|
+
/**
|
|
86
|
+
* Get multiple `VaultAccount`s given an account and existing list of `Vault`
|
|
87
|
+
* instances or vault addresses. If `vaults` is an array of strings, the vault
|
|
88
|
+
* data will be fetched in the same call as the account data.
|
|
89
|
+
*/
|
|
90
|
+
static getVaultAccounts(provider: SignerOrProvider, account: string, vaults: Vault[] | string[]): Promise<VaultAccount[]>;
|
|
91
|
+
/**
|
|
92
|
+
* Get all `VaultAccount`s for a given account.
|
|
93
|
+
* Fetches the vault data in the same call as the account data.
|
|
94
|
+
*/
|
|
95
|
+
static getAllVaultAccounts(provider: SignerOrProvider, account: string): Promise<VaultAccount[]>;
|
|
96
|
+
/**
|
|
97
|
+
* Get paginated `VaultAccount`s for a given account.
|
|
98
|
+
* Fetches the vault data in the same call as the account data.
|
|
99
|
+
* @note Throws an error if `start + count` exceeds the number of vaults.
|
|
100
|
+
*/
|
|
101
|
+
static getPaginatedVaultAccounts(provider: SignerOrProvider, account: string, start: number | undefined, count: number): Promise<VaultAccount[]>;
|
|
75
102
|
}
|
|
76
103
|
//# sourceMappingURL=account.d.ts.map
|
package/dist/account.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAE,WAAW,EAAkB,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"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"}
|
package/dist/account.js
CHANGED
|
@@ -2,8 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.VaultAccount = void 0;
|
|
4
4
|
const token_1 = require("./token");
|
|
5
|
+
const vault_1 = require("./vault");
|
|
5
6
|
const misc_1 = require("./misc");
|
|
6
7
|
const constants_1 = require("./constants");
|
|
8
|
+
const isVaultInstanceArray = (vaults) => {
|
|
9
|
+
return typeof vaults[0] !== "string";
|
|
10
|
+
};
|
|
7
11
|
/**
|
|
8
12
|
* Class to provide information about a vault user's account
|
|
9
13
|
* and to wrap interactions.
|
|
@@ -43,7 +47,7 @@ class VaultAccount {
|
|
|
43
47
|
if (this.vault.controller !== controller.address) {
|
|
44
48
|
throw Error(`Unexpected controller address: ${this.vault.controller}`);
|
|
45
49
|
}
|
|
46
|
-
return controller.
|
|
50
|
+
return controller.setAnnualInterestBips(this.vault.address, newAprBips);
|
|
47
51
|
}
|
|
48
52
|
async approveAllowanceRemainder(amount) {
|
|
49
53
|
const token = this.vault.underlyingToken;
|
|
@@ -72,6 +76,36 @@ class VaultAccount {
|
|
|
72
76
|
}
|
|
73
77
|
return this.vault.contract.withdraw(amount.raw, this.account);
|
|
74
78
|
}
|
|
79
|
+
async repay(amount) {
|
|
80
|
+
const signer = await this.vault.signer.getAddress();
|
|
81
|
+
if (signer !== this.account) {
|
|
82
|
+
throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
|
|
83
|
+
}
|
|
84
|
+
if (!this.isBorrower) {
|
|
85
|
+
throw Error("Only borrower can repay");
|
|
86
|
+
}
|
|
87
|
+
return this.vault.contract.repay(amount);
|
|
88
|
+
}
|
|
89
|
+
async repayOutstandingDebt() {
|
|
90
|
+
const signer = await this.vault.signer.getAddress();
|
|
91
|
+
if (signer !== this.account) {
|
|
92
|
+
throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
|
|
93
|
+
}
|
|
94
|
+
if (!this.isBorrower) {
|
|
95
|
+
throw Error("Only borrower can repay");
|
|
96
|
+
}
|
|
97
|
+
return this.vault.contract.repayOutstandingDebt();
|
|
98
|
+
}
|
|
99
|
+
async repayDelinquentDebt() {
|
|
100
|
+
const signer = await this.vault.signer.getAddress();
|
|
101
|
+
if (signer !== this.account) {
|
|
102
|
+
throw Error(`VaultAccount signer ${signer} does not match ${this.account}`);
|
|
103
|
+
}
|
|
104
|
+
if (!this.isBorrower) {
|
|
105
|
+
throw Error("Only borrower can repay");
|
|
106
|
+
}
|
|
107
|
+
return this.vault.contract.repayDelinquentDebt();
|
|
108
|
+
}
|
|
75
109
|
/**
|
|
76
110
|
* @returns Amount of underlying token borrower can borrow
|
|
77
111
|
*/
|
|
@@ -145,6 +179,68 @@ class VaultAccount {
|
|
|
145
179
|
static fromAccountVaultInfoStruct(account, info, vault) {
|
|
146
180
|
return new VaultAccount(account, vault.vaultToken.getAmount(info.normalizedBalance), vault.underlyingToken.getAmount(info.underlyingBalance), info.underlyingApproval, vault);
|
|
147
181
|
}
|
|
182
|
+
static fromVaultDataWithAccountStruct(provider, account, info) {
|
|
183
|
+
return VaultAccount.fromAccountVaultInfoStruct(account, info.account, vault_1.Vault.fromVaultMetadataStruct(info.vault, provider));
|
|
184
|
+
}
|
|
185
|
+
/**
|
|
186
|
+
* Get a `VaultAccount` for a given account and existing `Vault` instance.
|
|
187
|
+
* If `vault` is a string, the vault data will be fetched in the same call as the account data.
|
|
188
|
+
*/
|
|
189
|
+
static async getVaultAccount(provider, account, vault) {
|
|
190
|
+
const lens = (0, constants_1.getLensContract)(provider);
|
|
191
|
+
if (vault instanceof vault_1.Vault) {
|
|
192
|
+
return lens
|
|
193
|
+
.getAccountVaultInfo(account, vault.address)
|
|
194
|
+
.then((info) => VaultAccount.fromAccountVaultInfoStruct(account, info, vault));
|
|
195
|
+
}
|
|
196
|
+
else {
|
|
197
|
+
return lens
|
|
198
|
+
.getVaultDataWithAccount(account, vault)
|
|
199
|
+
.then((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info));
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
/**
|
|
203
|
+
* Get multiple `VaultAccount`s given an account and existing list of `Vault`
|
|
204
|
+
* instances or vault addresses. If `vaults` is an array of strings, the vault
|
|
205
|
+
* data will be fetched in the same call as the account data.
|
|
206
|
+
*/
|
|
207
|
+
static async getVaultAccounts(provider, account, vaults) {
|
|
208
|
+
const lens = (0, constants_1.getLensContract)(provider);
|
|
209
|
+
if (vaults.length === 0) {
|
|
210
|
+
return [];
|
|
211
|
+
}
|
|
212
|
+
if (isVaultInstanceArray(vaults)) {
|
|
213
|
+
return lens
|
|
214
|
+
.getAccountVaultsInfo(account, vaults.map((v) => v.address))
|
|
215
|
+
.then((infos) => infos.map((info, i) => VaultAccount.fromAccountVaultInfoStruct(account, info, vaults[i])));
|
|
216
|
+
}
|
|
217
|
+
else {
|
|
218
|
+
return lens
|
|
219
|
+
.getVaultsDataWithAccount(account, vaults)
|
|
220
|
+
.then((infos) => infos.map((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info)));
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
/**
|
|
224
|
+
* Get all `VaultAccount`s for a given account.
|
|
225
|
+
* Fetches the vault data in the same call as the account data.
|
|
226
|
+
*/
|
|
227
|
+
static getAllVaultAccounts(provider, account) {
|
|
228
|
+
const lens = (0, constants_1.getLensContract)(provider);
|
|
229
|
+
return lens
|
|
230
|
+
.getAllVaultsDataWithAccount(account)
|
|
231
|
+
.then((infos) => infos.map((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info)));
|
|
232
|
+
}
|
|
233
|
+
/**
|
|
234
|
+
* Get paginated `VaultAccount`s for a given account.
|
|
235
|
+
* Fetches the vault data in the same call as the account data.
|
|
236
|
+
* @note Throws an error if `start + count` exceeds the number of vaults.
|
|
237
|
+
*/
|
|
238
|
+
static getPaginatedVaultAccounts(provider, account, start = 0, count) {
|
|
239
|
+
const lens = (0, constants_1.getLensContract)(provider);
|
|
240
|
+
return lens
|
|
241
|
+
.getPaginatedVaultsDataWithAccount(account, start, count)
|
|
242
|
+
.then((infos) => infos.map((info) => VaultAccount.fromVaultDataWithAccountStruct(provider, account, info)));
|
|
243
|
+
}
|
|
148
244
|
}
|
|
149
245
|
VaultAccount.UpdatableKeys = [
|
|
150
246
|
"vaultBalance",
|
package/dist/account.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":";;;AACA,mCAAsD;
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"","sources":["../src/account.ts"],"names":[],"mappings":"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"}
|
package/dist/constants.d.ts
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { BigNumber } from "ethers";
|
|
2
2
|
import { VaultLens, WildcatVaultController, WildcatVaultFactory, MockERC20Factory } from "./typechain";
|
|
3
3
|
import { SignerOrProvider } from "./types";
|
|
4
|
-
export declare const LensAddress = "
|
|
4
|
+
export declare const LensAddress = "0x078BE578bFB8f359399d3FAecb7e8a5583Af9fa2";
|
|
5
5
|
export declare const MockERC20FactoryAddress = "0x7d1d45890c937b260b7345B91d6B457e470B13e4";
|
|
6
|
-
export declare const FactoryAddress = "
|
|
7
|
-
export declare const ControllerAddress = "
|
|
6
|
+
export declare const FactoryAddress = "0xA7F3b0D71E0e526c9fb352725D7121583f18B2FE";
|
|
7
|
+
export declare const ControllerAddress = "0xE05EF4571Dd4b5B94a7104E33283A42FD238Ef6a";
|
|
8
8
|
export declare const getControllerContract: (provider: SignerOrProvider) => WildcatVaultController;
|
|
9
9
|
export declare const getFactoryContract: (provider: SignerOrProvider) => WildcatVaultFactory;
|
|
10
10
|
export declare const getLensContract: (provider: SignerOrProvider) => VaultLens;
|
package/dist/constants.js
CHANGED
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.WAD = exports.RAY = exports.getMockERC20Factory = exports.getLensContract = exports.getFactoryContract = exports.getControllerContract = exports.ControllerAddress = exports.FactoryAddress = exports.MockERC20FactoryAddress = exports.LensAddress = void 0;
|
|
4
4
|
const ethers_1 = require("ethers");
|
|
5
5
|
const typechain_1 = require("./typechain");
|
|
6
|
-
exports.LensAddress = "
|
|
6
|
+
exports.LensAddress = "0x078BE578bFB8f359399d3FAecb7e8a5583Af9fa2";
|
|
7
7
|
exports.MockERC20FactoryAddress = "0x7d1d45890c937b260b7345B91d6B457e470B13e4";
|
|
8
|
-
exports.FactoryAddress = "
|
|
9
|
-
exports.ControllerAddress = "
|
|
8
|
+
exports.FactoryAddress = "0xA7F3b0D71E0e526c9fb352725D7121583f18B2FE";
|
|
9
|
+
exports.ControllerAddress = "0xE05EF4571Dd4b5B94a7104E33283A42FD238Ef6a";
|
|
10
10
|
const getControllerContract = (provider) => {
|
|
11
11
|
return typechain_1.WildcatVaultController__factory.connect(exports.ControllerAddress, provider);
|
|
12
12
|
};
|
package/dist/controller.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import { WildcatVaultController, WildcatVaultController__factory } from "./typec
|
|
|
2
2
|
import { ContractWrapper, SignerOrProvider } from "./types";
|
|
3
3
|
import { Vault } from "./vault";
|
|
4
4
|
import { VaultParameters } from "./factory";
|
|
5
|
+
import { MakeOptional } from "./misc";
|
|
5
6
|
export declare class VaultController extends ContractWrapper<WildcatVaultController> {
|
|
6
7
|
address: string;
|
|
7
8
|
readonly contractFactory: typeof WildcatVaultController__factory;
|
|
@@ -9,6 +10,6 @@ export declare class VaultController extends ContractWrapper<WildcatVaultControl
|
|
|
9
10
|
isKnownVault(vault: string): Promise<boolean>;
|
|
10
11
|
getAllVaults(provider: SignerOrProvider): Promise<Vault[]>;
|
|
11
12
|
static getController(provider: SignerOrProvider): Promise<VaultController>;
|
|
12
|
-
deployVault(params: Omit<VaultParameters, "controller">): Promise<Vault>;
|
|
13
|
+
deployVault(params: Omit<MakeOptional<VaultParameters, "feeRecipient" | "borrower">, "controller">): Promise<Vault>;
|
|
13
14
|
}
|
|
14
15
|
//# sourceMappingURL=controller.d.ts.map
|
package/dist/controller.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAgB,eAAe,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"controller.d.ts","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,+BAA+B,EAAE,MAAM,aAAa,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAgB,eAAe,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,qBAAa,eAAgB,SAAQ,eAAe,CAAC,sBAAsB,CAAC;IAGvD,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,yCAAmC;gBAExC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAIxD,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAI7C,YAAY,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;WAYnD,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,eAAe,CAAC;IAI1E,WAAW,CACf,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,eAAe,EAAE,cAAc,GAAG,UAAU,CAAC,EAAE,YAAY,CAAC,GACrF,OAAO,CAAC,KAAK,CAAC;CAGlB"}
|
package/dist/controller.js
CHANGED
|
@@ -16,17 +16,19 @@ class VaultController extends types_1.ContractWrapper {
|
|
|
16
16
|
return await this.contract.vaults(vault);
|
|
17
17
|
}
|
|
18
18
|
async getAllVaults(provider) {
|
|
19
|
-
const factory =
|
|
20
|
-
const vaults = (
|
|
21
|
-
|
|
22
|
-
|
|
19
|
+
/* const factory = getFactoryContract(provider);
|
|
20
|
+
const vaults = (
|
|
21
|
+
await this.contract.queryFilter(factory.filters.VaultDeployed(ControllerAddress), 3399789)
|
|
22
|
+
).map(({ args: { vault } }) => vault);
|
|
23
|
+
console.log("vaults", vaults); */
|
|
24
|
+
const metadatas = (await (0, constants_1.getLensContract)(provider).getAllVaultsData()).filter((x) => x.controller === this.address);
|
|
23
25
|
return metadatas.map((x) => vault_1.Vault.fromVaultMetadataStruct(x, provider));
|
|
24
26
|
}
|
|
25
27
|
static async getController(provider) {
|
|
26
28
|
return new VaultController(constants_1.ControllerAddress, provider);
|
|
27
29
|
}
|
|
28
30
|
async deployVault(params) {
|
|
29
|
-
return factory_1.VaultFactory.deployVault({ ...params, controller: this.address }, this.
|
|
31
|
+
return factory_1.VaultFactory.deployVault({ ...params, controller: this.address }, this.signer);
|
|
30
32
|
}
|
|
31
33
|
}
|
|
32
34
|
exports.VaultController = VaultController;
|
package/dist/controller.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":";;;AAAA,2CAAsF;AACtF,
|
|
1
|
+
{"version":3,"file":"controller.js","sourceRoot":"","sources":["../src/controller.ts"],"names":[],"mappings":";;;AAAA,2CAAsF;AACtF,2CAAiE;AACjE,mCAA4D;AAC5D,mCAAgC;AAChC,uCAA0D;AAG1D,MAAa,eAAgB,SAAQ,uBAAuC;IAG1E,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,2CAA+B,CAAC;IAI3D,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa;QAC9B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,QAA0B;QAC3C;;;;yCAIiC;QACjC,MAAM,SAAS,GAAG,CAAC,MAAM,IAAA,2BAAe,EAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,CAAC,CAAC,MAAM,CAC3E,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,IAAI,CAAC,OAAO,CACrC,CAAC;QACF,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAK,CAAC,uBAAuB,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,QAA0B;QACnD,OAAO,IAAI,eAAe,CAAC,6BAAiB,EAAE,QAAQ,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,WAAW,CACf,MAAsF;QAEtF,OAAO,sBAAY,CAAC,WAAW,CAAC,EAAE,GAAG,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACxF,CAAC;CACF;AAhCD,0CAgCC"}
|
package/dist/factory.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Token, TokenAmount } from "./token";
|
|
2
2
|
import { WildcatVaultFactory, WildcatVaultFactory__factory } from "./typechain";
|
|
3
|
-
import { ContractWrapper, SignerOrProvider } from "./types";
|
|
3
|
+
import { ContractWrapper, Signer, SignerOrProvider } from "./types";
|
|
4
4
|
import { Vault } from "./vault";
|
|
5
|
+
import { MakeOptional } from "./misc";
|
|
5
6
|
export type VaultParameters = {
|
|
6
7
|
asset: Token;
|
|
7
8
|
namePrefix: string;
|
|
@@ -22,6 +23,6 @@ export declare class VaultFactory extends ContractWrapper<WildcatVaultFactory> {
|
|
|
22
23
|
constructor(address: string, provider: SignerOrProvider);
|
|
23
24
|
static getFactory(provider: SignerOrProvider): VaultFactory;
|
|
24
25
|
deployVault(params: VaultParameters): Promise<Vault>;
|
|
25
|
-
static deployVault(params: VaultParameters,
|
|
26
|
+
static deployVault(params: MakeOptional<VaultParameters, "feeRecipient" | "borrower" | "controller">, signer: Signer): Promise<Vault>;
|
|
26
27
|
}
|
|
27
28
|
//# sourceMappingURL=factory.d.ts.map
|
package/dist/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,4BAA4B,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,EAAE,KAAK,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,WAAW,CAAC;IAC5B,kBAAkB,EAAE,MAAM,CAAC;IAC3B,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,sBAAsB,EAAE,MAAM,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAKF,qBAAa,YAAa,SAAQ,eAAe,CAAC,mBAAmB,CAAC;IAGjD,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,sCAAgC;gBAErC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAI9D,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY;IAIrD,WAAW,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC;WAyB7C,WAAW,CAAC,MAAM,EAAE,YAAY,CAAC,eAAe,EAAE,cAAc,GAAG,UAAU,GAAG,YAAY,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;CAS5I"}
|
package/dist/factory.js
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.VaultFactory = void 0;
|
|
4
|
+
/* eslint-disable prettier/prettier */
|
|
5
|
+
const utils_1 = require("ethers/lib/utils");
|
|
4
6
|
const constants_1 = require("./constants");
|
|
5
7
|
const typechain_1 = require("./typechain");
|
|
6
8
|
const types_1 = require("./types");
|
|
7
9
|
const vault_1 = require("./vault");
|
|
10
|
+
const DefaultFeeRecipient = (0, utils_1.getAddress)(`0xf335`.padEnd(42, "0"));
|
|
8
11
|
class VaultFactory extends types_1.ContractWrapper {
|
|
9
12
|
constructor(address, provider) {
|
|
10
13
|
super(provider);
|
|
@@ -31,11 +34,16 @@ class VaultFactory extends types_1.ContractWrapper {
|
|
|
31
34
|
});
|
|
32
35
|
await tx.wait();
|
|
33
36
|
const address = await this.contract.computeVaultAddress(params.controller, await this.signer.getAddress(), params.asset.address);
|
|
34
|
-
return vault_1.Vault.
|
|
37
|
+
return vault_1.Vault.getVaultData(address, this.provider);
|
|
35
38
|
}
|
|
36
|
-
static async deployVault(params,
|
|
37
|
-
const factory = VaultFactory.getFactory(
|
|
38
|
-
return factory.deployVault(
|
|
39
|
+
static async deployVault(params, signer) {
|
|
40
|
+
const factory = VaultFactory.getFactory(signer);
|
|
41
|
+
return factory.deployVault({
|
|
42
|
+
feeRecipient: DefaultFeeRecipient,
|
|
43
|
+
controller: constants_1.ControllerAddress,
|
|
44
|
+
borrower: await signer.getAddress(),
|
|
45
|
+
...params
|
|
46
|
+
});
|
|
39
47
|
}
|
|
40
48
|
}
|
|
41
49
|
exports.VaultFactory = VaultFactory;
|
package/dist/factory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/factory.ts"],"names":[],"mappings":";;;AAAA,sCAAsC;AACtC,4CAA8C;AAC9C,2CAAgE;AAEhE,2CAAgF;AAChF,mCAAoE;AACpE,mCAAgC;AAmBhC,MAAM,mBAAmB,GAAG,IAAA,kBAAU,EAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC;AAEjE,MAAa,YAAa,SAAQ,uBAAoC;IAGpE,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,wCAA4B,CAAC;IAIxD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,QAA0B;QAC1C,OAAO,IAAI,YAAY,CAAC,0BAAc,EAAE,QAAQ,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAuB;QACvC,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;YACzC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO;YAC3B,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,YAAY,EAAE,MAAM,CAAC,YAAY;YACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,cAAc,EAAE,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,QAAQ,EAAE;YACpD,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;YAC7C,cAAc,EAAE,MAAM,CAAC,cAAc;YACrC,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;YACrD,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,YAAY,EAAE,MAAM,CAAC,YAAY;SAClC,CAAC,CAAC;QAEH,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QAChB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CACrD,MAAM,CAAC,UAAU,EACjB,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAC9B,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,CAAC;QACF,OAAO,aAAK,CAAC,YAAY,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAiF,EAAE,MAAc;QACxH,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,WAAW,CAAC;YACzB,YAAY,EAAE,mBAAmB;YACjC,UAAU,EAAE,6BAAiB;YAC7B,QAAQ,EAAE,MAAM,MAAM,CAAC,UAAU,EAAE;YACnC,GAAG,MAAM;SACV,CAAC,CAAC;IACL,CAAC;CACF;AA7CD,oCA6CC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,14 +1,17 @@
|
|
|
1
1
|
import { VaultAccount } from "./account";
|
|
2
2
|
import { VaultFactory } from "./factory";
|
|
3
|
-
import {
|
|
3
|
+
import { Token } from "./token";
|
|
4
4
|
import { Vault } from "./vault";
|
|
5
|
-
export * from "./vault";
|
|
6
|
-
export { Signer, Provider, SignerOrProvider } from "./types";
|
|
7
5
|
export * from "./account";
|
|
6
|
+
export * from "./constants";
|
|
8
7
|
export * from "./controller";
|
|
9
|
-
export * from "./token";
|
|
10
8
|
export * from "./factory";
|
|
11
|
-
export
|
|
12
|
-
export
|
|
13
|
-
export
|
|
9
|
+
export * from "./mockerc20factory";
|
|
10
|
+
export * from "./token";
|
|
11
|
+
export * from "./types";
|
|
12
|
+
export * from "./vault";
|
|
13
|
+
export declare const getVaultData: typeof Vault.getVaultData, getVaultsData: typeof Vault.getVaultsData, getAllVaultsData: typeof Vault.getAllVaultsData, getVaultsCount: typeof Vault.getVaultsCount, getPaginatedVaultsData: typeof Vault.getPaginatedVaultsData;
|
|
14
|
+
export declare const getFactory: typeof VaultFactory.getFactory, deployVault: typeof VaultFactory.deployVault;
|
|
15
|
+
export declare const getVaultAccount: typeof VaultAccount.getVaultAccount, getVaultAccounts: typeof VaultAccount.getVaultAccounts, getAllVaultAccounts: typeof VaultAccount.getAllVaultAccounts, getPaginatedVaultAccounts: typeof VaultAccount.getPaginatedVaultAccounts;
|
|
16
|
+
export declare const getTokenData: typeof Token.getTokenData, getTokensData: typeof Token.getTokensData;
|
|
14
17
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,oBAAoB,CAAC;AACnC,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AAExB,eAAO,MACL,YAAY,6BACZ,aAAa,8BACb,gBAAgB,iCAChB,cAAc,+BACd,sBAAsB,qCACf,CAAC;AAEV,eAAO,MAAQ,UAAU,kCAAE,WAAW,iCAAiB,CAAC;AAExD,eAAO,MAAQ,eAAe,uCAAE,gBAAgB,wCAAE,mBAAmB,2CAAE,yBAAyB,+CAClF,CAAC;AAEf,eAAO,MAAQ,YAAY,6BAAE,aAAa,4BAAU,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -14,43 +14,21 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.
|
|
18
|
-
const
|
|
17
|
+
exports.getTokensData = exports.getTokenData = exports.getPaginatedVaultAccounts = exports.getAllVaultAccounts = exports.getVaultAccounts = exports.getVaultAccount = exports.deployVault = exports.getFactory = exports.getPaginatedVaultsData = exports.getVaultsCount = exports.getAllVaultsData = exports.getVaultsData = exports.getVaultData = void 0;
|
|
18
|
+
const account_1 = require("./account");
|
|
19
19
|
const factory_1 = require("./factory");
|
|
20
|
-
const
|
|
20
|
+
const token_1 = require("./token");
|
|
21
21
|
const vault_1 = require("./vault");
|
|
22
|
-
__exportStar(require("./vault"), exports);
|
|
23
|
-
var types_2 = require("./types");
|
|
24
|
-
Object.defineProperty(exports, "Signer", { enumerable: true, get: function () { return types_2.Signer; } });
|
|
25
|
-
Object.defineProperty(exports, "Provider", { enumerable: true, get: function () { return types_2.Provider; } });
|
|
26
22
|
__exportStar(require("./account"), exports);
|
|
23
|
+
__exportStar(require("./constants"), exports);
|
|
27
24
|
__exportStar(require("./controller"), exports);
|
|
28
|
-
__exportStar(require("./token"), exports);
|
|
29
25
|
__exportStar(require("./factory"), exports);
|
|
30
|
-
exports
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const from = block;
|
|
39
|
-
const to = Math.min(block + 5000, currentBlock);
|
|
40
|
-
const newVaults = (await factory.queryFilter(factory.filters.VaultDeployed(), from, to)).map(({ args: { vault } }) => vault);
|
|
41
|
-
vaults.push(...newVaults);
|
|
42
|
-
}
|
|
43
|
-
const metadatas = await (0, constants_1.getLensContract)(provider).getVaultsMetadata(vaults);
|
|
44
|
-
return metadatas.map((x) => vault_1.Vault.fromVaultMetadataStruct(x, provider));
|
|
45
|
-
}
|
|
46
|
-
exports.getAllVaults = getAllVaults;
|
|
47
|
-
async function getAllVaultAccountsForUser(provider) {
|
|
48
|
-
const account = await provider.getAddress();
|
|
49
|
-
const vaults = await getAllVaults(provider);
|
|
50
|
-
const accounts = (await Promise.all(vaults.map((vault) => vault.getAccountInfo(account)))).filter((acct) => {
|
|
51
|
-
return acct.userHasBalance || acct.userHasUnderlyingBalance || acct.isBorrower;
|
|
52
|
-
});
|
|
53
|
-
return accounts;
|
|
54
|
-
}
|
|
55
|
-
exports.getAllVaultAccountsForUser = getAllVaultAccountsForUser;
|
|
26
|
+
__exportStar(require("./mockerc20factory"), exports);
|
|
27
|
+
__exportStar(require("./token"), exports);
|
|
28
|
+
__exportStar(require("./types"), exports);
|
|
29
|
+
__exportStar(require("./vault"), exports);
|
|
30
|
+
exports.getVaultData = vault_1.Vault.getVaultData, exports.getVaultsData = vault_1.Vault.getVaultsData, exports.getAllVaultsData = vault_1.Vault.getAllVaultsData, exports.getVaultsCount = vault_1.Vault.getVaultsCount, exports.getPaginatedVaultsData = vault_1.Vault.getPaginatedVaultsData;
|
|
31
|
+
exports.getFactory = factory_1.VaultFactory.getFactory, exports.deployVault = factory_1.VaultFactory.deployVault;
|
|
32
|
+
exports.getVaultAccount = account_1.VaultAccount.getVaultAccount, exports.getVaultAccounts = account_1.VaultAccount.getVaultAccounts, exports.getAllVaultAccounts = account_1.VaultAccount.getAllVaultAccounts, exports.getPaginatedVaultAccounts = account_1.VaultAccount.getPaginatedVaultAccounts;
|
|
33
|
+
exports.getTokenData = token_1.Token.getTokenData, exports.getTokensData = token_1.Token.getTokensData;
|
|
56
34
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,uCAAyC;AACzC,uCAAyC;AACzC,mCAAgC;AAChC,mCAAgC;AAEhC,4CAA0B;AAC1B,8CAA4B;AAC5B,+CAA6B;AAC7B,4CAA0B;AAC1B,qDAAmC;AACnC,0CAAwB;AACxB,0CAAwB;AACxB,0CAAwB;AAGtB,oBAAY,GAKV,aAAK,eAJP,qBAAa,GAIX,aAAK,gBAHP,wBAAgB,GAGd,aAAK,mBAFP,sBAAc,GAEZ,aAAK,iBADP,8BAAsB,GACpB,aAAK,wBAAC;AAEK,kBAAU,GAAkB,sBAAY,aAA5B,mBAAW,GAAK,sBAAY,aAAC;AAEzC,uBAAe,GAC5B,sBAAY,kBADkB,wBAAgB,GAC9C,sBAAY,mBADoC,2BAAmB,GACnE,sBAAY,sBADyD,iCAAyB,GAC9F,sBAAY,2BAAC;AAEA,oBAAY,GAAoB,aAAK,eAAvB,qBAAa,GAAK,aAAK,eAAC"}
|
package/dist/misc.d.ts
CHANGED
|
@@ -4,4 +4,5 @@ export type OnlyValueFields<C> = {
|
|
|
4
4
|
export type ValueFields<C, K extends keyof C> = K extends string ? K extends keyof C ? C[K] extends (...args: any[]) => any ? never : K : never : never;
|
|
5
5
|
export declare function updateValue<O, K extends keyof O>(obj: O, otherObj: O, key: K): void;
|
|
6
6
|
export declare function updateObject<O>(obj: O, otherObj: O, keys: Array<keyof O>): void;
|
|
7
|
+
export type MakeOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
|
|
7
8
|
//# sourceMappingURL=misc.d.ts.map
|
package/dist/misc.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../src/misc.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;KAC9B,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,GAC5D,CAAC,SAAS,MAAM,CAAC,GACf,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAClC,KAAK,GACL,CAAC,GACH,KAAK,GACP,KAAK,CAAC;AAIV,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAEnF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAI/E"}
|
|
1
|
+
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../src/misc.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;KAC9B,CAAC,IAAI,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,CAAC,SAAS,MAAM,GAC5D,CAAC,SAAS,MAAM,CAAC,GACf,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,GAClC,KAAK,GACL,CAAC,GACH,KAAK,GACP,KAAK,CAAC;AAIV,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,GAAG,IAAI,CAEnF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,GAAG,IAAI,CAI/E;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ContractWrapper, SignerOrProvider } from "./types";
|
|
1
|
+
import { ContractWrapper, Signer, SignerOrProvider } from "./types";
|
|
2
2
|
import { MockERC20Factory, MockERC20Factory__factory } from "./typechain";
|
|
3
3
|
import { Token } from "./token";
|
|
4
4
|
export declare class TokenFactory extends ContractWrapper<MockERC20Factory> {
|
|
@@ -6,6 +6,7 @@ export declare class TokenFactory extends ContractWrapper<MockERC20Factory> {
|
|
|
6
6
|
readonly contractFactory: typeof MockERC20Factory__factory;
|
|
7
7
|
constructor(address: string, provider: SignerOrProvider);
|
|
8
8
|
static getFactory(provider: SignerOrProvider): TokenFactory;
|
|
9
|
+
static deployToken(signer: Signer, name: string, symbol: string): Promise<Token>;
|
|
9
10
|
deployToken(name: string, symbol: string): Promise<Token>;
|
|
10
11
|
}
|
|
11
12
|
//# sourceMappingURL=mockerc20factory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockerc20factory.d.ts","sourceRoot":"","sources":["../src/mockerc20factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"mockerc20factory.d.ts","sourceRoot":"","sources":["../src/mockerc20factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAE1E,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,qBAAa,YAAa,SAAQ,eAAe,CAAC,gBAAgB,CAAC;IAG9C,OAAO,EAAE,MAAM;IAFlC,QAAQ,CAAC,eAAe,mCAA6B;gBAElC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB;IAI9D,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,gBAAgB,GAAG,YAAY;WAI9C,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAKhF,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;CAShE"}
|
package/dist/mockerc20factory.js
CHANGED
|
@@ -14,6 +14,10 @@ class TokenFactory extends types_1.ContractWrapper {
|
|
|
14
14
|
static getFactory(provider) {
|
|
15
15
|
return new TokenFactory(constants_1.MockERC20FactoryAddress, provider);
|
|
16
16
|
}
|
|
17
|
+
static async deployToken(signer, name, symbol) {
|
|
18
|
+
const factory = TokenFactory.getFactory(signer);
|
|
19
|
+
return factory.deployToken(name, symbol);
|
|
20
|
+
}
|
|
17
21
|
async deployToken(name, symbol) {
|
|
18
22
|
const receipt = await this.contract.deploy(name, symbol).then((r) => r.wait());
|
|
19
23
|
const { args: { token, decimals } } = receipt.events.find((e) => e.event === "NewTokenDeployed");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mockerc20factory.js","sourceRoot":"","sources":["../src/mockerc20factory.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"mockerc20factory.js","sourceRoot":"","sources":["../src/mockerc20factory.ts"],"names":[],"mappings":";;;AAAA,mCAAoE;AACpE,2CAA0E;AAE1E,mCAAgC;AAChC,2CAAsD;AAEtD,MAAa,YAAa,SAAQ,uBAAiC;IAGjE,YAAmB,OAAe,EAAE,QAA0B;QAC5D,KAAK,CAAC,QAAQ,CAAC,CAAC;QADC,YAAO,GAAP,OAAO,CAAQ;QAFzB,oBAAe,GAAG,qCAAyB,CAAC;IAIrD,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,QAA0B;QAC1C,OAAO,IAAI,YAAY,CAAC,mCAAuB,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,MAAc,EAAE,IAAY,EAAE,MAAc;QACnE,MAAM,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAChD,OAAO,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC3C,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,IAAY,EAAE,MAAc;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAE/E,MAAM,EACJ,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,EAC1B,GAAG,OAAO,CAAC,MAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,kBAAkB,CAA2B,CAAC;QAE1F,OAAO,IAAI,aAAK,CAAC,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvE,CAAC;CACF;AAzBD,oCAyBC"}
|
package/dist/token.d.ts
CHANGED
|
@@ -12,7 +12,7 @@ export declare class TokenAmount {
|
|
|
12
12
|
get name(): string;
|
|
13
13
|
get symbol(): string;
|
|
14
14
|
get decimals(): number;
|
|
15
|
-
toFixed(digits?: number):
|
|
15
|
+
toFixed(digits?: number): string;
|
|
16
16
|
format(digits?: number, withSymbol?: boolean): string;
|
|
17
17
|
gt(amount: RhsAmount): boolean;
|
|
18
18
|
lt(amount: RhsAmount): boolean;
|
|
@@ -35,7 +35,8 @@ export declare class Token extends ContractWrapper<IERC20> {
|
|
|
35
35
|
getAmount(amount: RhsAmount): TokenAmount;
|
|
36
36
|
parseAmount(amount: number | string): TokenAmount;
|
|
37
37
|
static fromTokenMetadataStruct(metadata: TokenMetadataStructOutput, provider: SignerOrProvider): Token;
|
|
38
|
-
static
|
|
38
|
+
static getTokenData(token: string, provider: SignerOrProvider): Promise<Token>;
|
|
39
|
+
static getTokensData(tokens: string[], provider: SignerOrProvider): Promise<Token[]>;
|
|
39
40
|
}
|
|
40
41
|
export {};
|
|
41
42
|
//# sourceMappingURL=token.d.ts.map
|
package/dist/token.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../src/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAEtE,OAAO,EAAsB,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEtD,KAAK,SAAS,GAAG,YAAY,GAAG,WAAW,CAAC;AAQ5C,eAAO,MAAM,cAAc,eAAgB,WAAW,EAAE,KAAG,WACtB,CAAC;AAEtC,eAAO,MAAM,cAAc,eAAgB,WAAW,EAAE,KAAG,WACtB,CAAC;
|
|
1
|
+
{"version":3,"file":"token.d.ts","sourceRoot":"","sources":["../src/token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,QAAQ,CAAC;AAEtE,OAAO,EAAsB,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE5D,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEtD,KAAK,SAAS,GAAG,YAAY,GAAG,WAAW,CAAC;AAQ5C,eAAO,MAAM,cAAc,eAAgB,WAAW,EAAE,KAAG,WACtB,CAAC;AAEtC,eAAO,MAAM,cAAc,eAAgB,WAAW,EAAE,KAAG,WACtB,CAAC;AAItC,qBAAa,WAAW;IACH,GAAG,EAAE,SAAS;IAAS,KAAK,EAAE,KAAK;gBAAnC,GAAG,EAAE,SAAS,EAAS,KAAK,EAAE,KAAK;IAEtD,IAAI,IAAI,IAAI,MAAM,CAEjB;IAED,IAAI,MAAM,IAAI,MAAM,CAEnB;IAED,IAAI,QAAQ,IAAI,MAAM,CAErB;IAED,OAAO,CAAC,MAAM,SAAgB,GAAG,MAAM;IAQvC,MAAM,CAAC,MAAM,SAAgB,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,MAAM;IAI5D,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK9B,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK9B,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK/B,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK/B,EAAE,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO;IAK9B,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;IAKnC,GAAG,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;IAKnC,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;CASvC;AAED,qBAAa,KAAM,SAAQ,eAAe,CAAC,MAAM,CAAC;IAIvC,OAAO,EAAE,MAAM;IACf,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,MAAM;IAChB,MAAM,EAAE,OAAO;IAPxB,QAAQ,CAAC,eAAe,yBAAmB;gBAGlC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,OAAO,EACtB,QAAQ,EAAE,gBAAgB;IAKtB,MAAM,IAAI,OAAO,CAAC,mBAAmB,CAAC;IAO5C,SAAS,CAAC,MAAM,EAAE,SAAS,GAAG,WAAW;IAIzC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,WAAW;IAKjD,MAAM,CAAC,uBAAuB,CAC5B,QAAQ,EAAE,yBAAyB,EACnC,QAAQ,EAAE,gBAAgB,GACzB,KAAK;WAWK,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,CAAC;WAMvE,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,gBAAgB,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;CAM3F"}
|