Skip to content
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.

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

[SDK-CORE/ METADATA] SDK-Core No Governance Fix + Metadata Types #1728

Merged
merged 2 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 packages/automation-contracts/autowrap/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"dependencies": {
"@openzeppelin/contracts": "4.9.3",
"@superfluid-finance/ethereum-contracts": "1.8.1",
"@superfluid-finance/metadata": "1.1.17"
"@superfluid-finance/metadata": "1.1.18"
}
}
2 changes: 1 addition & 1 deletion packages/automation-contracts/scheduler/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"dependencies": {
"@openzeppelin/contracts": "4.9.3",
"@superfluid-finance/ethereum-contracts": "1.8.1",
"@superfluid-finance/metadata": "1.1.17"
"@superfluid-finance/metadata": "1.1.18"
}
}
2 changes: 1 addition & 1 deletion packages/ethereum-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"@safe-global/safe-service-client": "^2.0.3",
"@safe-global/safe-web3-lib": "^1.9.4",
"@superfluid-finance/js-sdk": "0.6.3",
"@superfluid-finance/metadata": "1.1.17",
"@superfluid-finance/metadata": "1.1.18",
"async": "^3.2.4",
"csv-writer": "^1.6.0",
"ethers": "^5.7.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/js-sdk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"cloc": "sh tasks/cloc.sh"
},
"dependencies": {
"@superfluid-finance/metadata": "1.1.17",
"@superfluid-finance/metadata": "1.1.18",
"@truffle/contract": "4.6.29",
"auto-bind": "4.0.0",
"node-fetch": "2.7.0"
Expand Down
4 changes: 4 additions & 0 deletions packages/metadata/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ All notable changes to the metadata will be documented in this file.

This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v1.1.18]
### Fixed
- Changed the `module/networks/list.d.ts` file to correctly reflect the `contractsV1` object in our `networks.json` file.

## [v1.1.17]
### Fixed
- Removed `governance` from testnets, changes frequently and can't be reliably kept up to date here
Expand Down
13 changes: 7 additions & 6 deletions packages/metadata/module/networks/list.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ interface AutowrapAddresses {
interface ContractAddresses {
readonly resolver: string;
readonly host: string;
readonly governance: string;
readonly governance?: string;
readonly cfaV1: string;
readonly cfaV1Forwarder: string;
readonly idaV1: string;
Expand All @@ -14,11 +14,12 @@ interface ContractAddresses {
readonly constantOutflowNFT?: string;
readonly constantInflowNFT?: string;
readonly superfluidLoader: string;
readonly toga: string;
readonly vestingScheduler: string;
readonly flowScheduler: string;
readonly batchLiquidator: string;
readonly autowrap: AutowrapAddresses;
readonly toga?: string;
readonly vestingScheduler?: string;
readonly flowScheduler?: string;
readonly batchLiquidator?: string;
readonly superSpreader?: string;
readonly autowrap?: AutowrapAddresses;
readonly existentialNFTCloneFactory: string;
}
interface SubgraphData {
Expand Down
2 changes: 1 addition & 1 deletion packages/metadata/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superfluid-finance/metadata",
"version": "1.1.17",
"version": "1.1.18",
"description": "Superfluid Metadata",
"main": "main/index.cjs",
"module": "module/index.js",
Expand Down
4 changes: 4 additions & 0 deletions packages/sdk-core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

## [0.6.11] - 2023-10-20

### Fixed
- Handle the case when `networkData.addresses.governance` is null. This was due to a removal of the `governance` address from the metadata for test networks in `[email protected]`.

## [0.6.10] - 2023-10-16

Expand Down
4 changes: 2 additions & 2 deletions packages/sdk-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@superfluid-finance/sdk-core",
"version": "0.6.10",
"version": "0.6.11",
"description": "SDK Core for building with Superfluid Protocol",
"homepage": "https://github.com/superfluid-finance/protocol-monorepo/tree/dev/packages/sdk-core#readme",
"repository": {
Expand Down Expand Up @@ -57,7 +57,7 @@
},
"dependencies": {
"@superfluid-finance/ethereum-contracts": "1.8.1",
"@superfluid-finance/metadata": "1.1.17",
"@superfluid-finance/metadata": "1.1.18",
"browserify": "^17.0.0",
"graphql-request": "^6.1.0",
"lodash": "^4.17.21",
Expand Down
11 changes: 10 additions & 1 deletion packages/sdk-core/src/Framework.ts
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,23 @@
networkData != null &&
baseSettings.protocolReleaseVersion === V1
) {
let governanceAddress = ethers.constants.AddressZero;

if (networkData.addresses.governance == null) {
governanceAddress = await Superfluid__factory.connect(

Check warning on line 186 in packages/sdk-core/src/Framework.ts

View check run for this annotation

Codecov / codecov/patch

packages/sdk-core/src/Framework.ts#L186

Added line #L186 was not covered by tests
networkData.addresses.host,
provider
).getGovernance();
}

const settings: IFrameworkSettings = {
...baseSettings,
config: {
resolverAddress,
hostAddress: networkData.addresses.host,
cfaV1Address: networkData.addresses.cfaV1,
idaV1Address: networkData.addresses.idaV1,
governanceAddress: networkData.addresses.governance,
governanceAddress,
cfaV1ForwarderAddress:
networkData.addresses.cfaV1Forwarder,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/sdk-core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ export type NetworkData = {
addresses: {
resolver: string;
host: string;
governance: string;
governance?: string;
cfaV1: string;
cfaV1Forwarder: string;
idaV1: string;
superTokenFactory: string;
superfluidLoader: string;
toga: string;
toga?: string;
};
};
2 changes: 1 addition & 1 deletion packages/subgraph/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"mustache": "^4.2.0"
},
"devDependencies": {
"@superfluid-finance/metadata": "1.1.17",
"@superfluid-finance/metadata": "1.1.18",
"coingecko-api": "^1.0.10",
"graphql": "^16.8.0",
"graphql-request": "^6.1.0",
Expand Down
Loading