Skip to content

feat: release #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 28, 2022
Merged

feat: release #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3db3d72
feat: Added rate model store from across v1
chrismaree Mar 21, 2022
ffbfa4b
feat: release
chrismaree Mar 23, 2022
4495874
nit
chrismaree Mar 28, 2022
3ca2f40
Merge branch 'master' into chrismaree/correct-release-version
chrismaree Mar 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@across-protocol/contracts-v2",
"version": "0.0.28",
"version": "0.0.32",
"author": "UMA Team",
"license": "AGPL-3.0",
"repository": {
Expand Down
6 changes: 5 additions & 1 deletion test/fixtures/HubPool.Fixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ import { repaymentChainId, finalFeeUsdc } from "../constants";
import { umaEcosystemFixture } from "./UmaEcosystem.Fixture";

export const hubPoolFixture = hre.deployments.createFixture(async ({ ethers }) => {
return await deployHubPool(ethers);
});

export async function deployHubPool(ethers: any) {
const [signer, crossChainAdmin] = await ethers.getSigners();

// This fixture is dependent on the UMA ecosystem fixture. Run it first and grab the output. This is used in the
Expand Down Expand Up @@ -64,7 +68,7 @@ export const hubPoolFixture = hre.deployments.createFixture(async ({ ethers }) =
await hubPool.setPoolRebalanceRoute(repaymentChainId, usdc.address, mockTokens.l2Usdc);

return { ...tokens, ...mockTokens, hubPool, mockAdapter, mockSpoke, crossChainAdmin, ...parentFixture };
});
}

export async function enableTokensForLP(owner: Signer, hubPool: Contract, weth: Contract, tokens: Contract[]) {
const lpTokens = [];
Expand Down
9 changes: 5 additions & 4 deletions test/fixtures/SpokePool.Fixture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { TokenRolesEnum } from "@uma/common";
import { getContractFactory, SignerWithAddress, Contract, hre, ethers, BigNumber, defaultAbiCoder } from "../utils";
import { getContractFactory, SignerWithAddress, Contract, hre } from "../utils";
import { ethers, BigNumber, defaultAbiCoder, toBN } from "../utils";
import * as consts from "../constants";

export const spokePoolFixture = hre.deployments.createFixture(async ({ ethers }) => {
Expand Down Expand Up @@ -116,12 +117,12 @@ export async function fillRelay(
.fillRelay(
...getFillRelayParams(
getRelayHash(
depositor.address,
recipient.address,
depositor.address ?? depositor,
recipient.address ?? recipient,
depositId,
originChainId,
consts.destinationChainId,
destErc20.address,
destErc20.address ?? destErc20,
depositAmount.toString(),
realizedLpFeePct.toString(),
relayerFeePct.toString()
Expand Down