create new release (#1029)

* Release hardhat deployer stable (#1009) * Add resolver and loader to deployer, add tests (#1011) * actions/setup-node cache property added (#1002) * Remove redundant deployments (#1014) * specify cache-dependency-path (#1018) * Ethereum 1.3.1 - for hardhat deployer update (#1016) * Update CHANGELOG.md * bump ethereum-contractw to 1.3.1 * Update CHANGELOG.md * Fix release branch (#1024) * add tokenDecimals option to deploy-test-token.js (#1025) * Map indexId to IndexSubscription (#1026) * bump contract version, add test for loader (#1028) Co-authored-by: 0xdavinchee <0xdavinchee@gmail.com> Co-authored-by: Miao ZhiCheng <miao@superfluid.finance> Co-authored-by: Kaspar Kallas <kaspar@superfluid.finance>
superfluid-finance · Aug 10, 2022 · f7f479d · f7f479d
1 parent d37c4d9
commit f7f479d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 33 deletions.
diff --git a/packages/hardhat-deployer/README.md b/packages/hardhat-deployer/README.md
@@ -94,35 +94,3 @@ describe("Super App Unit Tests", async function () {
     });
 });
 ```
-
-## Internals
-
-### Deploy
-
-The `deploy` function does the following, in order.
-
-1. Deploy the `ERC1820Registry` to its appropriate address (if not deployed)
-2. Deploy `Resolver`
-3. Deploy `TestGovernance`
-4. Register `TestGovernance` with `Resolver`
-5. Deploy `Superfluid`
-6. Initialize `Superfluid` with `TestGovernance`
-7. Register `Superfluid` with `Resolver`
-8. Initialize `TestGovernance`
-9. Deploy `ConstantFlowAgreementV1`
-10. Register `ConstantFlowAgreementV1` with `TestGovernance`
-11. Deploy `SlotsBitmapLibrary`
-12. Deploy `InstantDistributionAgreementV1` with link to `SlotsBitmapLibrary`
-13. Register `InstantDistributionAgreementV1` with `TestGovernance`
-14. Deploy `SuperTokenFactoryHelper`
-15. Deploy `SuperTokenFactory`
-16. "Update Code" with `TestGovernance`, registering the `SuperTokenFactory` with `Superfluid`
-17. Return the `Resolver` address
-
-### DeployMockSuperToken
-
-The `deployMockSuperToken` function does the following, in order.
-
-1. Deploy `ERC20PresetMinterPauser` with mint and pause permission to the `deployer`
-2. Calls `createERC20Wrapper` on the `SuperTokenFactory` with the `ERC20PresetMinterPauser`
-3. Returns both in a Javascript Object
diff --git a/packages/hardhat-deployer/package.json b/packages/hardhat-deployer/package.json
@@ -56,7 +56,7 @@
     },
     "peerDependencies": {
         "@nomiclabs/hardhat-ethers": "^2.0.6",
-        "@superfluid-finance/ethereum-contracts": "^1.2.2",
+        "@superfluid-finance/ethereum-contracts": "^1.3.1",
         "ethers": "^5.6.8",
         "hardhat": "^2.0.0"
     },

diff --git a/packages/hardhat-deployer/test/superfluidFrameworkDeployer.test.ts b/packages/hardhat-deployer/test/superfluidFrameworkDeployer.test.ts
@@ -99,6 +99,10 @@ describe("Unit Tests", async function () {
             );
             assert.notEqual(await host.getSuperTokenFactory(), ethers.constants.AddressZero);
             assert.notEqual(await host.getGovernance(), ethers.constants.AddressZero);
+            assert.notEqual(
+                await resolver.get("SuperfluidLoader-v1"),
+                ethers.constants.AddressZero
+            );
         });
 
         it("Should deploy a mock wrapper super token", async function () {

diff --git a/packages/sdk-core/CHANGELOG.md b/packages/sdk-core/CHANGELOG.md
@@ -5,6 +5,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased]
 
+- Map `indexId` to `IndexSubscription` when querying from Subgraph
+
 ## [0.5.2] - 2022-07-26
 
 ### Added

diff --git a/packages/sdk-core/src/subgraph/entities/indexSubscription/indexSubscription.ts b/packages/sdk-core/src/subgraph/entities/indexSubscription/indexSubscription.ts
@@ -34,6 +34,7 @@ export interface IndexSubscription {
     units: BigNumber;
     indexTotalUnits: BigNumber;
     index: SubgraphId;
+    indexId: string;
     token: Address;
     tokenSymbol: string;
     subscriber: Address;
@@ -77,6 +78,7 @@ export class IndexSubscriptionQueryHandler extends SubgraphQueryHandler<
             updatedAtTimestamp: Number(x.updatedAtTimestamp),
             updatedAtBlockNumber: Number(x.updatedAtBlockNumber),
             index: x.index.id,
+            indexId: x.index.indexId,
             indexValueCurrent: x.index.indexValue,
             indexTotalUnits: x.index.totalUnits,
             token: x.index.token.id,

diff --git a/packages/sdk-core/src/subgraph/entities/indexSubscription/indexSubscriptions.graphql b/packages/sdk-core/src/subgraph/entities/indexSubscription/indexSubscriptions.graphql
@@ -13,6 +13,7 @@ query indexSubscriptions($first: Int = 10, $orderBy: IndexSubscription_orderBy =
         id
         index {
             id
+            indexId,
             indexValue
             totalUnits
             token {