ulixee · blakebyrnes · Jul 17, 2024 · Jul 16, 2024
diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml
@@ -18,28 +18,30 @@ jobs:
         uses: actions/checkout@v4
 
       - uses: actions/setup-python@v5
+        if: ${{ matrix.os != 'windows-latest' }}
         with:
           python-version: '3.10'
 
       - uses: actions/setup-node@v4
         with:
           node-version: 20
 
-      - name: Chocolatey Install Action
-        if: ${{ matrix.os == 'windows-latest' }}
-        uses: crazy-max/ghaction-chocolatey@v3
-        with:
-          args: install python2 visualcpp-build-tools -y
-
       - name: Add msbuild to PATH
-        if: matrix.os == 'windows-latest'
+        if: ${{ matrix.os == 'windows-latest' }}
         uses: microsoft/setup-msbuild@v2
 
+      - name: Add PIP Setuptools
+        if: ${{ matrix.os == 'windows-latest' }}
+        run: pip.exe install setuptools
+
       - name: Set timeout
         run: yarn config set network-timeout 1000000 -g
 
       - name: Yarn build
-        run: yarn && yarn build && yarn build:dist && cd build-dist && yarn
+        run: yarn && yarn build && yarn build:dist
+
+      - run: yarn
+        working-directory: build-dist
 
       - run: mkdir ~/.private_keys && echo "$APPLE_NOTARIZE_KEY" > ~/.private_keys/AuthKey_5VH6PQ3585.p8
         if: ${{ matrix.os == 'macos-latest' }}

diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml
@@ -56,21 +56,6 @@ jobs:
         working-directory: ./build
         run: sudo $(npx install-browser-deps)
 
-      - name: /etc/hosts
-        if: ${{ matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' }}
-        run: |
-          sudo echo "127.0.0.1 host.docker.internal" | sudo tee -a /etc/hosts
-          sudo echo "127.0.0.1 docs.datastoresrus.com" | sudo tee -a /etc/hosts
-          sudo echo "127.0.0.1 bootup-datastore.com" | sudo tee -a /etc/hosts
-        shell: bash
-
-      - name: C:/Windows/System32/drivers/etc/hosts
-        if: ${{ matrix.os == 'windows-latest' }}
-        run: |
-          echo "127.0.0.1 docs.datastoresrus.com" | tee -a C:/Windows/System32/drivers/etc/hosts
-          echo "127.0.0.1 bootup-datastore.com" | tee -a C:/Windows/System32/drivers/etc/hosts
-        shell: bash
-
       - name: Run tests
         run: yarn test --testTimeout=60000 --maxWorkers=2
         env:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0-alpha.29](https://github.com/ulixee/platform/compare/v2.0.0-alpha.28...v2.0.0-alpha.29) (2024-07-16)
+
+
+### Bug Fixes
+
+* **datastores:** include rollup json ([9797762](https://github.com/ulixee/platform/commit/97977625ad2d2158131a1e43ea7a42009e0e5c5e)), closes [#201](https://github.com/ulixee/platform/issues/201)
+* **end-to-end:** use docker for e2e tests ([3f243de](https://github.com/ulixee/platform/commit/3f243deb40d2b1cc86048d171d574b3690a29395))
+* **github:** databroker tests broken ([801f62c](https://github.com/ulixee/platform/commit/801f62cad9e16e441cbea7fe3660098ade31ef34))
+
+
+### Features
+
+* **databroker:** new feature to delegate payment ([47900e3](https://github.com/ulixee/platform/commit/47900e314b8d9f59f88598b1d914e211e1ae5bdf))
+* **datastore:** integrate escrow payments ([b00fdd5](https://github.com/ulixee/platform/commit/b00fdd52e36bc9480297639a5584a6f71d6890dd))
+* **desktop:** accounts vs localchains ([2c63e7e](https://github.com/ulixee/platform/commit/2c63e7eb1d0d7261dc00a74b80fa9a30a48ebb42))
+* **desktop:** add qr code to wallet ([ca432da](https://github.com/ulixee/platform/commit/ca432da2847ba95fccfc25cf7c51f93638c12964))
+* **desktop:** update wallet ux ([3b9fbfb](https://github.com/ulixee/platform/commit/3b9fbfba9c91bec72b3dbc4b88b83eb39992d617))
+* integrate argon payments to desktop ([b8a7ffd](https://github.com/ulixee/platform/commit/b8a7ffd651d88160afbfe7906c09e2eac06a345d))
+
+
+
+
+
 # [2.0.0-alpha.28](https://github.com/ulixee/platform/compare/v2.0.0-alpha.27...v2.0.0-alpha.28) (2024-03-11)
 
 **Note:** Version bump only for package @ulixee/platform

diff --git a/cli/CHANGELOG.md b/cli/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0-alpha.29](https://github.com/ulixee/ulixee/compare/v2.0.0-alpha.28...v2.0.0-alpha.29) (2024-07-16)
+
+
+### Features
+
+* **datastore:** integrate escrow payments ([b00fdd5](https://github.com/ulixee/ulixee/commit/b00fdd52e36bc9480297639a5584a6f71d6890dd))
+
+
+
+
+
 # [2.0.0-alpha.28](https://github.com/ulixee/ulixee/compare/v2.0.0-alpha.27...v2.0.0-alpha.28) (2024-03-11)
 
 **Note:** Version bump only for package @ulixee/cli

diff --git a/cli/package.json b/cli/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@ulixee/cli",
-  "version": "2.0.0-alpha.28",
+  "version": "2.0.0-alpha.29",
   "main": "index.js",
   "repository": "git@github.com:ulixee/ulixee.git",
   "license": "MIT",
   "bin": "./bin/cli.js",
   "dependencies": {
-    "@ulixee/commons": "2.0.0-alpha.28",
+    "@ulixee/commons": "2.0.0-alpha.29",
     "commander": "^9.5.0"
   }
 }
diff --git a/client/main/CHANGELOG.md b/client/main/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0-alpha.29](https://github.com/ulixee/platform/compare/v2.0.0-alpha.28...v2.0.0-alpha.29) (2024-07-16)
+
+
+### Features
+
+* **databroker:** new feature to delegate payment ([47900e3](https://github.com/ulixee/platform/commit/47900e314b8d9f59f88598b1d914e211e1ae5bdf))
+* **datastore:** integrate escrow payments ([b00fdd5](https://github.com/ulixee/platform/commit/b00fdd52e36bc9480297639a5584a6f71d6890dd))
+
+
+
+
+
 # [2.0.0-alpha.28](https://github.com/ulixee/platform/compare/v2.0.0-alpha.27...v2.0.0-alpha.28) (2024-03-11)
 
 **Note:** Version bump only for package @ulixee/client

diff --git a/client/main/package.json b/client/main/package.json
@@ -1,24 +1,24 @@
 {
   "name": "@ulixee/client",
-  "version": "2.0.0-alpha.28",
+  "version": "2.0.0-alpha.29",
   "main": "index.js",
   "repository": "git@github.com:ulixee/platform.git",
   "license": "MIT",
   "scripts": {},
   "dependencies": {
-    "@ulixee/commons": "2.0.0-alpha.28",
-    "@ulixee/datastore": "2.0.0-alpha.28",
-    "@ulixee/net": "2.0.0-alpha.28",
-    "@ulixee/schema": "2.0.0-alpha.28",
-    "@ulixee/localchain": "2.0.0-alpha.29"
+    "@ulixee/commons": "2.0.0-alpha.29",
+    "@ulixee/datastore": "2.0.0-alpha.29",
+    "@ulixee/localchain": "2.0.0-alpha.29",
+    "@ulixee/net": "2.0.0-alpha.29",
+    "@ulixee/schema": "2.0.0-alpha.29"
   },
   "devDependencies": {
-    "@ulixee/cloud": "2.0.0-alpha.28",
-    "@ulixee/platform-utils": "2.0.0-alpha.28",
-    "@ulixee/datastore-packager": "2.0.0-alpha.28",
-    "@ulixee/datastore-testing": "2.0.0-alpha.28",
-    "@ulixee/schema": "2.0.0-alpha.28",
-    "@ulixee/sql-ast": "2.0.0-alpha.28",
-    "@ulixee/sql-engine": "2.0.0-alpha.28"
+    "@ulixee/cloud": "2.0.0-alpha.29",
+    "@ulixee/datastore-packager": "2.0.0-alpha.29",
+    "@ulixee/datastore-testing": "2.0.0-alpha.29",
+    "@ulixee/platform-utils": "2.0.0-alpha.29",
+    "@ulixee/schema": "2.0.0-alpha.29",
+    "@ulixee/sql-ast": "2.0.0-alpha.29",
+    "@ulixee/sql-engine": "2.0.0-alpha.29"
   }
 }
diff --git a/cloud/examples/CHANGELOG.md b/cloud/examples/CHANGELOG.md
@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0-alpha.29](https://github.com/ulixee/platform/compare/v2.0.0-alpha.28...v2.0.0-alpha.29) (2024-07-16)
+
+**Note:** Version bump only for package @ulixee/cloud-examples
+
+
+
+
+
 # [2.0.0-alpha.28](https://github.com/ulixee/platform/compare/v2.0.0-alpha.27...v2.0.0-alpha.28) (2024-03-11)
 
 **Note:** Version bump only for package @ulixee/cloud-examples

diff --git a/cloud/examples/package.json b/cloud/examples/package.json
@@ -1,9 +1,9 @@
 {
   "name": "@ulixee/cloud-examples",
-  "version": "2.0.0-alpha.28",
+  "version": "2.0.0-alpha.29",
   "private": true,
   "dependencies": {
-    "@ulixee/cloud": "2.0.0-alpha.28",
-    "@ulixee/hero": "2.0.0-alpha.28"
+    "@ulixee/cloud": "2.0.0-alpha.29",
+    "@ulixee/hero": "2.0.0-alpha.29"
   }
 }
diff --git a/cloud/main/.env.defaults b/cloud/main/.env.defaults
@@ -19,9 +19,10 @@ ULX_DATASTORE_DIR=<DATA>/ulixee/datastores
 # A directory to store hero sessions used in queries
 ULX_QUERY_HERO_SESSIONS_DIR=<DATA>/ulixee/query-hero-sessions
 
-
 # A whitelist of comma separated identities (bech32 strings) who can administer this server [@ulixee/platform-utils/lib/Identity.bech32]
 ULX_CLOUD_ADMIN_IDENTITIES=
+# Payment Address of this Miner owner to pay out datastore revenue (bech32 string)
+ULX_PAYMENT_ADDRESS=
 
 ## Hosted Services
 ULX_DATASTORE_STATS_HOST=# Stats Tracker Service Host
@@ -34,8 +35,6 @@ ULX_DATASTORE_LOOKUP_SERVICE_HOST=
 
 # Price per query (microgons). This is on top of Datastore pricing, used for cloud hosting.
 ULX_PRICE_PER_QUERY=0
-# Default mainchain host TODO: fill in once mainchain is up
-ULX_MAINCHAIN_HOST=
 
 # The mode for the server
 ULX_SERVER_ENVIRONMENT=development
@@ -45,6 +44,24 @@ ULX_ENABLE_SQLITE_WAL=true
 ULX_DATASTORES_MUST_HAVE_OWN_ADMIN=false
 ULX_ENABLE_GLOBAL_CONFIG=true
 
+
+## Localchain Configuration
+
+# Path to the localchain
+ULX_LOCALCHAIN_PATH=
+# Default mainchain host TODO: fill in once mainchain is up#
+ULX_MAINCHAIN_URL=
+# A vote output address for the localchain (activates vote creation)
+ULX_VOTES_ADDRESS=
+# The preferred notary to use
+ULX_NOTARY_ID=1
+# Prompt for an interactive password on the cli
+ULX_LOCALCHAIN_PASSWORD_INTERACTIVE_CLI=
+# Path to the localchain password file
+ULX_LOCALCHAIN_PASSWORD_FILE=
+# The localchain password loaded into memory (unsafe)
+ULX_LOCALCHAIN_PASSWORD=
+
 ## Hero
 ULX_DATA_DIR=<TMP>/.ulixee
 ## Chrome Settings
@@ -53,7 +70,7 @@ ULX_SHOW_CHROME=# always show chrome
 ULX_NO_CHROME_SANDBOX=# don't force the chrome sandbox
 ULX_DISABLE_GPU=# disable the gpu setting on chrome
 
-ULX_ENABLE_SQLITE_WAL=# enable write ahead log for sqlite
+ULX_ENABLE_SQLITE_WAL=true# enable write ahead log for sqlite
 
 ## Agent
 ULX_DISABLE_MITM=# disable the MITM on all requests

diff --git a/cloud/main/CHANGELOG.md b/cloud/main/CHANGELOG.md
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.0.0-alpha.29](https://github.com/ulixee/platform/compare/v2.0.0-alpha.28...v2.0.0-alpha.29) (2024-07-16)
+
+
+### Bug Fixes
+
+* **github:** databroker tests broken ([801f62c](https://github.com/ulixee/platform/commit/801f62cad9e16e441cbea7fe3660098ade31ef34))
+
+
+### Features
+
+* **databroker:** new feature to delegate payment ([47900e3](https://github.com/ulixee/platform/commit/47900e314b8d9f59f88598b1d914e211e1ae5bdf))
+* **datastore:** integrate escrow payments ([b00fdd5](https://github.com/ulixee/platform/commit/b00fdd52e36bc9480297639a5584a6f71d6890dd))
+* **desktop:** update wallet ux ([3b9fbfb](https://github.com/ulixee/platform/commit/3b9fbfba9c91bec72b3dbc4b88b83eb39992d617))
+
+
+
+
+
 # [2.0.0-alpha.28](https://github.com/ulixee/platform/compare/v2.0.0-alpha.27...v2.0.0-alpha.28) (2024-03-11)
 
 **Note:** Version bump only for package @ulixee/cloud

diff --git a/cloud/main/package.json b/cloud/main/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ulixee/cloud",
-  "version": "2.0.0-alpha.28",
+  "version": "2.0.0-alpha.29",
   "description": "The Ulixee Cloud is an out-of-the box tool to host and deploy Ulixee Datastores and Hero scripts. It allows you to easily create a paid API service.",
   "exports": {
     ".": {
@@ -20,26 +20,26 @@
     "preversion": "node ../../build/cloud/main/scripts/gatherEnvSettings.js"
   },
   "peerDependencies": {
-    "@ulixee/desktop-core": "2.0.0-alpha.28"
+    "@ulixee/desktop-core": "2.0.0-alpha.29"
   },
   "peerDependenciesMeta": {
     "@ulixee/desktop-core": {
       "optional": true
     }
   },
   "dependencies": {
-    "@ulixee/commons": "2.0.0-alpha.28",
-    "@ulixee/platform-utils": "2.0.0-alpha.28",
-    "@ulixee/datastore-core": "2.0.0-alpha.28",
-    "@ulixee/datastore-plugins-hero-core": "2.0.0-alpha.28",
-    "@ulixee/hero-core": "2.0.0-alpha.28",
-    "@ulixee/hero-interfaces": "2.0.0-alpha.28",
-    "@ulixee/net": "2.0.0-alpha.28",
-    "@ulixee/platform-specification": "2.0.0-alpha.28",
+    "@ulixee/commons": "2.0.0-alpha.29",
+    "@ulixee/datastore-core": "2.0.0-alpha.29",
+    "@ulixee/datastore-plugins-hero-core": "2.0.0-alpha.29",
+    "@ulixee/hero-core": "2.0.0-alpha.29",
+    "@ulixee/hero-interfaces": "2.0.0-alpha.29",
+    "@ulixee/net": "2.0.0-alpha.29",
+    "@ulixee/platform-specification": "2.0.0-alpha.29",
+    "@ulixee/platform-utils": "2.0.0-alpha.29",
     "commander": "^9.5.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@ulixee/datastore-testing": "2.0.0-alpha.28"
+    "@ulixee/datastore-testing": "2.0.0-alpha.29"
   }
 }
diff --git a/datastore/broker-admin/CHANGELOG.md b/datastore/broker-admin/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+# [2.0.0-alpha.29](https://github.com/ulixee/platform/compare/v2.0.0-alpha.28...v2.0.0-alpha.29) (2024-07-16)
+
+
+### Features
+
+* **databroker:** new feature to delegate payment ([47900e3](https://github.com/ulixee/platform/commit/47900e314b8d9f59f88598b1d914e211e1ae5bdf))
diff --git a/datastore/broker-admin/package.json b/datastore/broker-admin/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ulixee/databroker-admin",
   "private": true,
-  "version": "2.0.0-alpha.28",
+  "version": "2.0.0-alpha.29",
   "scripts": {
     "serve": "vite",
     "watch": "vite build -w",
@@ -15,13 +15,13 @@
     "@tailwindcss/forms": "^0.5.0",
     "@types/lodash.kebabcase": "^4.1.7",
     "@types/node": "^18.19.10",
+    "@ulixee/commons": "2.0.0-alpha.29",
+    "@ulixee/net": "2.0.0-alpha.29",
+    "@ulixee/platform-specification": "2.0.0-alpha.29",
+    "@ulixee/platform-utils": "2.0.0-alpha.29",
     "autoprefixer": "^10.4.2",
     "axios": "^1.6.7",
     "concurrently": "^6.2.2",
-    "@ulixee/platform-utils": "2.0.0-alpha.28",
-    "@ulixee/net": "2.0.0-alpha.28",
-    "@ulixee/platform-specification": "2.0.0-alpha.28",
-    "@ulixee/commons": "2.0.0-alpha.28",
     "eslint": "^8.17.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
@@ -40,15 +40,15 @@
     "vue-router": "^4.0.0-0"
   },
   "devDependencies": {
-    "@vitejs/plugin-vue": "^1.6.1",
     "@typescript-eslint/eslint-plugin": "^6.20.0",
     "@typescript-eslint/parser": "^6.20.0",
+    "@vitejs/plugin-vue": "^1.6.1",
     "@vue/eslint-config-prettier": "^7.0.0",
     "@vue/eslint-config-typescript": "^10.0.0",
     "typescript": "^5.3.3",
     "vite": "^2.5.4",
-    "vite-svg-loader": "^5.1.0",
     "vite-plugin-checker": "^0.6.4",
+    "vite-svg-loader": "^5.1.0",
     "vue-tsc": "^1.8.27"
   },
   "nohoist": [