Merge remote-tracking branch 'refs/remotes/origin/main' into feat/UM-…

…6719-erc1155-offers # Conflicts: # subgraph.testnet.yaml
aavegotchi · Aug 7, 2024 · 176b44d · 176b44d
2 parents 770fcc4 + 43690d2
commit 176b44d
Show file tree

Hide file tree

Showing 6 changed files with 91 additions and 124 deletions.
diff --git a/.github/workflows/deploy-satsuma-test.yml b/.github/workflows/deploy-satsuma-test.yml
@@ -0,0 +1,33 @@
+name: Deploy to Satsuma Service
+
+on:
+    push:
+        tags:
+            - "test-*"
+
+jobs:
+    buildAndDeploy:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v1
+            - name: Install node
+              uses: actions/setup-node@v1
+              with:
+                  node-version: 16
+            - name: Install Yarn
+              run: npm i -g yarn
+            - name: Install Libs
+              run: yarn --frozen-lockfile
+            - name: Codegen
+              run: yarn codegen:testnet
+            - name: Build
+              run: yarn build:testnet
+            - name: Deploy to Satsuma on testnet
+              run: |
+                  npx graph deploy aavegotchi-core-amoy \
+                    --deploy-key ${{secrets.SATSUMA_ACCESS_TOKEN}} \
+                    --node https://subgraphs.alchemy.com/api/subgraphs/deploy \
+                    --ipfs https://ipfs.satsuma.xyz \
+                    --version-label ${GITHUB_REF#refs/*/} \
+                    subgraph.testnet.yaml
+              shell: bash
diff --git a/.github/workflows/deploy-satsuma.yml b/.github/workflows/deploy-satsuma.yml
@@ -3,7 +3,7 @@ name: Deploy to Satsuma Service
 on:
     push:
         tags:
-            - "*"
+            - "prod-*"
 
 jobs:
     buildAndDeploy:

diff --git a/.github/workflows/graph.yml b/.github/workflows/graph.yml
diff --git a/.github/workflows/run-e2e.yml b/.github/workflows/run-e2e.yml
diff --git a/package.json b/package.json
@@ -5,6 +5,8 @@
   "scripts": {
     "codegen": "graph codegen",
     "build": "graph build",
+    "codegen:testnet": "graph codegen subgraph.testnet.yaml",
+    "build:testnet": "graph build subgraph.testnet.yaml",
     "deploy": "graph deploy --node https://api.thegraph.com/deploy/ --ipfs https://api.thegraph.com/ipfs/ aavegotchi/aavegotchi-core-matic",
     "create-local": "graph create --node http://localhost:8020/ aavegotchi/aavegotchi-core-matic",
     "remove-local": "graph remove --node http://localhost:8020/ aavegotchi/aavegotchi-core-matic",

diff --git a/subgraph.mumbai.yaml → subgraph.testnet.yaml b/subgraph.mumbai.yaml → subgraph.testnet.yaml
@@ -1,21 +1,16 @@
 specVersion: 0.0.4
-# features:
-#     - grafting
-# graft:
-#     base: QmV3LtUtUCiD774HXR3D9SJBNgw2VNcXZM9McyMGTfotBQ # Subgraph ID of base subgraph
-#     block: 28127642 # Block number
-description: Aavegotchi Core Mumbai
+description: Aavegotchi Core Testnet
 repository:
 schema:
     file: ./schema.graphql
 dataSources:
     - kind: ethereum/contract
       name: AavegotchiDiamond
-      network: mumbai
+      network: polygon-amoy
       source:
-          address: "0x83e73d9cf22dfc3a767ea1ce0611f7f50306622e"
+          address: "0xC80DB01aeDAD5F6E3088c75F60E52f579Cf1D3Cb"
           abi: AavegotchiDiamond
-          startBlock: 34467860
+          startBlock: 9668200
       mapping:
           kind: ethereum/events
           apiVersion: 0.0.6
@@ -31,8 +26,6 @@ dataSources:
           eventHandlers:
               - event: BuyPortals(indexed address,indexed address,uint256,uint256,uint256)
                 handler: handleBuyPortals
-              - event: Xingyun(indexed address,indexed address,uint256,uint256,uint256)
-                handler: handleXingyun
               - event: PortalOpened(indexed uint256)
                 handler: handlePortalOpened
               - event: ClaimAavegotchi(indexed uint256)
@@ -117,8 +110,8 @@ dataSources:
               #   handler: handleGotchiLendingEnd
               # - event: GotchiLendingExecute(indexed uint32)
               #   handler: handleGotchiLendingExecute
-              # - event: GotchiLendingCancel(indexed uint32,uint256)
-              #   handler: handleGotchiLendingCancel
+              - event: GotchiLendingCancel(indexed uint32,uint256)
+                handler: handleGotchiLendingCancel
               - event: ERC1155ExecutedToRecipient(indexed uint256,indexed address,indexed address)
                 handler: handleERC1155ExecutedToRecipient
               - event: ERC721ExecutedToRecipient(indexed uint256,indexed address,indexed address)
@@ -236,11 +229,11 @@ dataSources:
     # -
     - kind: ethereum/contract
       name: RealmDiamond
-      network: mumbai
+      network: polygon-amoy
       source:
-          address: "0x726F201A9aB38cD56D60ee392165F1434C4F193D"
+          address: "0x5a4faEb79951bAAa0866B72fD6517E693c8E4620"
           abi: RealmDiamond
-          startBlock: 26930227
+          startBlock: 5349600
       mapping:
           kind: ethereum/events
           apiVersion: 0.0.6
@@ -263,55 +256,55 @@ dataSources:
           file: ./src/mappings/diamond.ts
     - kind: ethereum/contract
       name: FAKEGotchisCardDiamond
-      network: mumbai
+      network: polygon-amoy
       source:
-          address: "0x118c19F39a4Ad9032B7b7b228A2Cd927d3FddA13"
-          abi: IERC1155
-          startBlock: 28400000
+        address: "0xC80DB01aeDAD5F6E3088c75F60E52f579Cf1D3Cb"
+        abi: IERC1155
+        startBlock: 10125000
       mapping:
-          kind: ethereum/events
-          apiVersion: 0.0.5
-          language: wasm/assemblyscript
-          entities:
-              - Card
-          abis:
-              - name: IERC721
-                file: ./abis/diamond_erc721.json
-              - name: IERC1155
-                file: ./abis/diamond_erc1155.json
-          eventHandlers:
-              - event: NewSeriesStarted(indexed uint256,indexed uint256)
-                handler: handleNewSeriesStarted
-              - event: TransferSingle(indexed address,indexed address,indexed address,uint256,uint256)
-                handler: handleTransferSingle
-              - event: TransferBatch(indexed address,indexed address,indexed address,uint256[],uint256[])
-                handler: handleTransferBatch
-          file: ./src/mappings/fakeGotchisCard.ts
+        kind: ethereum/events
+        apiVersion: 0.0.6
+        language: wasm/assemblyscript
+        entities:
+          - Card
+        abis:
+          - name: IERC721
+            file: ./abis/diamond_erc721.json
+          - name: IERC1155
+            file: ./abis/diamond_erc1155.json
+        eventHandlers:
+          - event: NewSeriesStarted(indexed uint256,indexed uint256)
+            handler: handleNewSeriesStarted
+#          - event: TransferSingle(indexed address,indexed address,indexed address,uint256,uint256)
+#            handler: handleTransferSingle
+#          - event: TransferBatch(indexed address,indexed address,indexed address,uint256[],uint256[])
+#            handler: handleTransferBatch
+        file: ./src/mappings/fakeGotchisCard.ts
     - kind: ethereum/contract
       name: FAKEGotchisNFTDiamond
-      network: mumbai
+      network: polygon-amoy
       source:
-          address: "0x330088c3372f4F78cF023DF16E1e1564109191dc"
-          abi: IERC721
-          startBlock: 28400000
+        address: "0xC80DB01aeDAD5F6E3088c75F60E52f579Cf1D3Cb"
+        abi: IERC721
+        startBlock: 10125000
       mapping:
-          kind: ethereum/events
-          apiVersion: 0.0.5
-          language: wasm/assemblyscript
-          entities:
-              - NFT
-          abis:
-              - name: IERC721
-                file: ./abis/diamond_erc721.json
-              - name: IERC1155
-                file: ./abis/diamond_erc1155.json
-          eventHandlers:
-              - event: Transfer(indexed address,indexed address,indexed uint256)
-                handler: handleTransfer
-              - event: MetadataActionLog(indexed uint256,(address,uint16[2],uint16,uint32,uint32,address,uint40,uint8,bool,string,string,string,string,string,string,string,string,string))
-                handler: handleMetadataActionLog
-              - event: MetadataFlag(indexed uint256,address)
-                handler: handleMetadataFlag
-              - event: MetadataLike(indexed uint256,address)
-                handler: handleMetadataLike
-          file: ./src/mappings/fakeGotchisNFT.ts
+        kind: ethereum/events
+        apiVersion: 0.0.6
+        language: wasm/assemblyscript
+        entities:
+          - NFT
+        abis:
+          - name: IERC721
+            file: ./abis/diamond_erc721.json
+          - name: IERC1155
+            file: ./abis/diamond_erc1155.json
+        eventHandlers:
+#          - event: Transfer(indexed address,indexed address,indexed uint256)
+#            handler: handleTransfer
+          - event: MetadataActionLog(indexed uint256,(address,uint16[2],uint16,uint32,uint32,address,uint40,uint8,bool,string,string,string,string,string,string,string,string,string))
+            handler: handleMetadataActionLog
+#          - event: MetadataFlag(indexed uint256,address)
+#            handler: handleMetadataFlag
+#          - event: MetadataLike(indexed uint256,address)
+#            handler: handleMetadataLike
+        file: ./src/mappings/fakeGotchisNFT.ts