Merge pull request #96 from onflow/stable-cadence-refactor

Merge Stable Cadence Changes to main

.github/workflows/ci.yml

@@ -9,39 +9,32 @@ jobs:
     name: NFTStorefront V2 Integration Tests
     timeout-minutes: 10
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: ["1.16"]
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-node@v3
       with:
-        node-version: 15.0.0
-        cache: 'npm'
-        cache-dependency-path: lib/js/test/package-lock.json
+        submodules: "true"
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.20
     - name: Install Flow CLI
-      run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/master/install.sh)" -- v0.43.0
-    - name: Flow cli Version
-      run: flow version
-    - name: Update PATH
-      run: echo "/root/.local/bin" >> $GITHUB_PATH
-    - name: Install dependencies
-      run: cd lib/js/test && npm ci
+      run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/feature/stable-cadence/install.sh)"
     - name: Run tests
-      run: cd lib/js/test && npm run test
-  V1-Integration-Tests:
+      run: flow test -f ./flow.testing.json --cover --covercode="contracts/NFTStorefrontV2.cdc" ./test/NFTStorefrontV2_test.cdc
+  V2-Integration-Tests:
     name: NFTStorefront V1 Integration Tests
+    timeout-minutes: 10
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.16'
-      - uses: actions/cache@v1
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-      - run: make ci
+    - uses: actions/checkout@v3
+      with:
+        submodules: "true"
+    - name: Set up Go
+      uses: actions/setup-go@v3
+      with:
+        go-version: 1.20
+    - name: Install Flow CLI
+      run: sh -ci "$(curl -fsSL https://raw.githubusercontent.com/onflow/flow-cli/feature/stable-cadence/install.sh)"
+    - name: Run tests
+      run: flow test -f ./flow.testing.json --cover --covercode="contracts/NFTStorefront.cdc" ./test/NFTStorefrontV1_test.cdc
 

.gitignore

@@ -1,5 +1,6 @@
 lib/js/test/node_modules/*
 .idea
+coverage.json
 *.pkey
 *.pub
-.env
+.env

Makefile

@@ -1,15 +1,18 @@
+.PHONY: update-mainnet
+update-mainnet:
+	$(MAKE) flow accounts update-contract NFTStorefrontV2 ./contracts/NFTStorefrontV2.cdc --signer mainnet-account --network mainnet -f ./flow.mainnet.json
+
+.PHONY: update-testnet
+update-testnet:
+	$(MAKE) flow accounts update-contract NFTStorefrontV2 ./contracts/NFTStorefrontV2.cdc --signer testnet-account --network testnet -f ./flow.testnet.json
+
 .PHONY: test
 test:
+	$(MAKE) generate -C lib/go
 	$(MAKE) test -C lib/go
+	flow-c1 test --cover --covercode="contracts" tests/*.cdc
 
 .PHONY: ci
 ci:
 	$(MAKE) ci -C lib/go
-
-.PHONY: update-mainnet
-update-mainnet:
-	$(MAKE) flow accounts update-contract NFTStorefrontV2 ./contracts/NFTStorefrontV2.cdc --signer mainnet-account --network mainnet -f ./flow.mainnet.json
-
-.PHONY: update-testnet
-update-testnet:
-	$(MAKE) flow accounts update-contract NFTStorefrontV2 ./contracts/NFTStorefrontV2.cdc --signer testnet-account --network testnet -f ./flow.testnet.json
+	flow-c1 test --cover --covercode="contracts" tests/*.cdc

README.md

@@ -14,10 +14,10 @@ Detailed docs: [docs/documentation.md](docs/documentation.md)
 
 ## Contract Addresses 
 
-|Name|Testnet|Mainnet|
-|----|-------|-------|
-|[NFTStorefront](contracts/NFTStorefront.cdc)|[0x94b06cfca1d8a476](https://testnet.flowdiver.io/contract/A.94b06cfca1d8a476.NFTStorefront)|[0x4eb8a10cb9f87357](https://www.flowdiver.io/contract/A.4eb8a10cb9f87357.NFTStorefront)|
-|[NFTStorefrontV2 (recommended)](contracts/NFTStorefrontV2.cdc)|[0x2d55b98eb200daef](https://testnet.flowdiver.io/contract/A.2d55b98eb200daef.NFTStorefrontV2)|[0x4eb8a10cb9f87357](https://www.flowdiver.io/contract/A.4eb8a10cb9f87357.NFTStorefrontV2)|
+|Name|Testnet|Previewnet|Mainnet|
+|----|-------|------|-------|
+|[NFTStorefront](contracts/NFTStorefront.cdc)|[0x94b06cfca1d8a476](https://flow-view-source.com/testnet/account/0x94b06cfca1d8a476/contract/NFTStorefront)|[0x6df5e52755433994](contracts/NFTStorefront.cdc)|[0x4eb8a10cb9f87357](https://flowscan.org/contract/A.4eb8a10cb9f87357.NFTStorefront)|
+|[NFTStorefrontV2 (recommended)](contracts/NFTStorefrontV2.cdc)|[0x2d55b98eb200daef](https://flow-view-source.com/testnet/account/0x2d55b98eb200daef/contract/NFTStorefrontV2)|[0x6df5e52755433994](contracts/NFTStorefrontV2.cdc)|[0x4eb8a10cb9f87357](https://flowscan.org/contract/A.4eb8a10cb9f87357.NFTStorefrontV2)|
 
 ## Usage