-
Notifications
You must be signed in to change notification settings - Fork 51
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'LF-3988' of github.com:lifinance/contracts into LF-3988
- Loading branch information
Showing
62 changed files
with
2,951 additions
and
259 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -65,7 +65,7 @@ jobs: | |
| LATEST_TAG=$(echo "$release_json" | jq -r '.[0].name') | ||
| # we need to make sure that on staging we're going to update a -beta version, if any | ||
| if [[ "$BRANCH_NAME" != "master" ]]; then | ||
| if [[ "$BRANCH_NAME" != "main" ]]; then | ||
| # if it has already "-beta", no other action is required, since it means | ||
| # that we're already going to update the latest staging release | ||
| if [[ "$LATEST_TAG" != *"beta"* ]]; then | ||
|
|
@@ -90,7 +90,7 @@ jobs: | |
| uses: christian-draeger/[email protected] | ||
| with: | ||
| current-version: "${{ env.LATEST_TAG }}" | ||
| version-fragment: "${{ env.BRANCH_NAME == 'master' && (contains(github.event.head_commit.message, 'major') && 'major' || contains(github.event.head_commit.message, 'feat') && 'feature' || 'bug') || 'beta' }}" | ||
| version-fragment: "${{ env.BRANCH_NAME == 'main' && (contains(github.event.head_commit.message, 'major') && 'major' || contains(github.event.head_commit.message, 'feat') && 'feature' || 'bug') || 'beta' }}" | ||
|
|
||
| - name: Push tag | ||
| if: steps.bump_version.outputs.next-version | ||
|
|
@@ -107,6 +107,6 @@ jobs: | |
| git commit -m "actions: new contracts version ${{ steps.bump_version.outputs.next-version }}" | ||
| git tag -a v${{ steps.bump_version.outputs.next-version }} -m "${{ github.event.head_commit.message }}" | ||
| git push origin tag v${{ steps.bump_version.outputs.next-version }} | ||
| if [[ "$BRANCH_NAME" == "master" ]]; then | ||
| if [[ "$BRANCH_NAME" == "main" ]]; then | ||
| git push -u origin $BRANCH_NAME | ||
| fi | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { HardhatRuntimeEnvironment } from 'hardhat/types' | ||
| import { DeployFunction } from 'hardhat-deploy/types' | ||
| import { network } from 'hardhat' | ||
| import { diamondContractName, deployFacet } from './9999_utils' | ||
| import config from '../config/across.json' | ||
|
|
||
| interface AcrossConfig { | ||
| [network: string]: { | ||
| acrossSpokePool?: string | ||
| weth?: string | ||
| } | ||
| } | ||
|
|
||
| const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) { | ||
| if (!(config as AcrossConfig)[network.name]) { | ||
| console.log(`No Across config set for ${network.name}. Skipping...`) | ||
| return | ||
| } | ||
|
|
||
| const SPOKE_POOL = (config as AcrossConfig)[network.name].acrossSpokePool | ||
| const WETH = (config as AcrossConfig)[network.name].weth | ||
|
|
||
| await deployFacet(hre, 'AcrossFacet', { args: [SPOKE_POOL, WETH] }) | ||
| } | ||
|
|
||
| export default func | ||
|
|
||
| func.id = 'deploy_across_facet' | ||
| func.tags = ['DeployAcrossFacet'] | ||
| func.dependencies = [ | ||
| // 'InitialFacets', | ||
| // diamondContractName, | ||
| // 'InitFacets', | ||
| // 'DeployDexManagerFacet', | ||
| ] |
Oops, something went wrong.