Merge branch 'master' into mint_oracle

.github/dependabot.yml

@@ -0,0 +1,22 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: "/"
+    schedule:
+      interval: daily
+  - package-ecosystem: gomod
+    directory: "/"
+    schedule:
+      interval: daily
+  - package-ecosystem: npm
+    directory: "/web"
+    schedule:
+      interval: daily
+  - package-ecosystem: npm
+    directory: "/craft-rest-api-master"
+    schedule:
+      interval: daily
+  - package-ecosystem: cargo
+    directory: "/nft-cw"
+    schedule:
+      interval: daily

.github/workflows/build.yml

@@ -21,8 +21,8 @@ jobs:
 
     name: craft ${{ matrix.arch }} for ${{ matrix.targetos }}
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2.1.3
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3.2.1
         with: 
           go-version: '^1.18'
         env:
@@ -41,7 +41,7 @@ jobs:
           
           
 # uploads bin
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
         with:
           name: craftd ${{ matrix.targetos }} ${{ matrix.arch }}
           path: cmd/*

.github/workflows/codeql-analysis.yml

@@ -39,11 +39,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -54,7 +54,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2

.github/workflows/gosec.yml

@@ -13,7 +13,7 @@ jobs:
       GO111MODULE: on
     steps:
       - name: Checkout Source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Run Gosec Security Scanner
         uses: informalsystems/gosec@master
         with:

.github/workflows/maven.yml

@@ -11,8 +11,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-java@v2
+    - uses: actions/checkout@v3
+    - uses: actions/setup-java@v3
       with:
         distribution: 'temurin' # See 'Supported distributions' for available options
         java-version: '17'
@@ -26,7 +26,7 @@ jobs:
 #  tests:
 #    runs-on: ubuntu-latest
 #    steps:
-#      - uses: actions/checkout@v2
+#      - uses: actions/checkout@v3
 #      - name: Setup Java JDK
 #        uses: actions/[email protected]
 #        with:

.gitignore

@@ -1,6 +1,7 @@
 vue/node_modules
 vue/dist
 website/node_modules
+web/node_modules
 website/dist
 release/
 .idea/

.gitpod.yml

@@ -2,7 +2,7 @@
 # Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
 # and commit this file to your remote git repository to share the goodness with others.
 
-image: ghcr.io/faddat/cosmos
+image: ghcr.io/notional-labs/cosmos
 vscode:
   extensions:
     - golang.go

craft-rest-api-master/.env.example

@@ -17,9 +17,9 @@ CRAFT_DAO_ESCROW_WEBHOOK_URL="discord.webhook.url.here"
 # ===================================
 # CRAFT NFT CONTRACT ADDRESSES
 # ===================================
-CW721_CODE="3" # Used to query ALL contracts on chain for a given user
-ADDR721_REALESTATE="craft1qrwaatac4xvf4qnnagvsc93gcnv2x2t7mm575v3drzh2wcap9hasjlt6rr"
-ADDRM="craft146ypndztcmmrmyxef7e20cul82gh43vjnw4uacwdvg5sp9kva7sqs9g5gt"
+CW721_CODE="1" # Used to query ALL contracts on chain for a given user
+ADDR721_REALESTATE="craft14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9scrtpgm"
+ADDRM="craft1x8gwn06l85q0lyncy7zsde8zzdn588k2dck00a8j6lkprydcutwq50sx9w"
 
 # ===================================
 # DAO ASSET WALLETS (for exp pricing)