Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update aos console to 2.0.1 #387

Merged
merged 2 commits into from
Oct 30, 2024
Merged

chore: update aos console to 2.0.1 #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b449e0
chore: update aos console to 2.0.1
twilson63 Oct 30, 2024
95241f9
fix: corrected issue with live feed
twilson63 Oct 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@


Version: 2.0.1
Module: `bkjb55i07GUCUSWROtKK4HU1mBS_X0TyH3M5jMV6aPg`
Module: `oKBlsMP3UWrAUURWUzGO4ZGEqlurAL5UkidMLrYo8EM`

Sqlite-Module: `aGVVWHldKA7GBlI_w7Qp_agO6aKjCoOTPA1G2OlluXE`
Sqlite-Module: `9VBLtu07DtUhPNdIqnw0Z_QJ_GKQqNXHpzumG8DY-J4`

## Requirements

Expand Down
10 changes: 5 additions & 5 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"deploy": "npx -y [email protected] upload-file --turbo --local-path=./$(npm pack) -w ~/.wallet.json -F 0d009773-ce2c-4539-8e0d-c331db9ab348 | jq .created[0].dataTxId"
},
"dependencies": {
"@permaweb/aoconnect": "^0.0.48",
"@permaweb/aoconnect": "^0.0.59",
"arweave": "^1.15.1",
"chalk": "^5.3.0",
"figlet": "^1.7.0",
Expand All @@ -30,10 +30,10 @@
"yargs": "^17.7.2"
},
"aos": {
"module": "bkjb55i07GUCUSWROtKK4HU1mBS_X0TyH3M5jMV6aPg",
"sqlite": "aGVVWHldKA7GBlI_w7Qp_agO6aKjCoOTPA1G2OlluXE",
"llama": "oamLI-KZ1Q9MxNxWwLcqXYavpwKYf1EX1BpEofb6418",
"version": "2.0.0"
"module": "oKBlsMP3UWrAUURWUzGO4ZGEqlurAL5UkidMLrYo8EM",
"sqlite": "9VBLtu07DtUhPNdIqnw0Z_QJ_GKQqNXHpzumG8DY-J4",
"llama": "7eiZkMWDUQmY1SBIpumzYR5_XhVMbnjmA27Xbyt4QxU",
"version": "2.0.1"
},
"devDependencies": {
"esbuild": "^0.20.1"
Expand Down
8 changes: 4 additions & 4 deletions process/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"scripts": {
"build": "ao build",
"test": "node --test --experimental-wasm-memory64",
"deploy": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 1-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.0 -t Name -v xl",
"deploy-sqlite": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 1-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.0 -t Name -v sqlite-xl",
"deploy-llama": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 16-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.0 -t Name -v llama-xxl -t Extension -v WeaveDrive"
"deploy": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 1-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.1 -t Name -v aos-lg-2.0.1",
"deploy-sqlite": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 1-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.1 -t Name -v sqlite-lg-2.0.1",
"deploy-llama": "ao publish -w ~/.wallet.json process.wasm -t Memory-Limit -v 16-gb -t Compute-Limit -v 9000000000000 -t Module-Format -v wasm64-unknown-emscripten-draft_2024_02_15 -t AOS-Version -v 2.0.1 -t Name -v llama-xxl-2.0.1 -t Extension -v WeaveDrive"
}
}
}
2 changes: 1 addition & 1 deletion process/process.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ end
-- Implement assignable polyfills on _ao
assignment.init(ao)

local process = { _version = "2.0.0" }
local process = { _version = "2.0.1" }
local maxInboxCount = 10000

-- wrap ao.send and ao.spawn for magic table
Expand Down
4 changes: 2 additions & 2 deletions src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,13 +90,13 @@ if (argv['sqlite']) {
*
* https://github.com/permaweb/aos/issues/310
*/
if (argv['module']) {
if (argv['module']) {
if (argv['module'].length === 43) {
process.env.AOS_MODULE = argv['module']
} else {
process.env.AOS_MODULE_NAME = argv['module']
}
}
}

let cron = null

Expand Down
2 changes: 1 addition & 1 deletion src/services/connect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export async function live(id, watch) {

try {
isJobRunning = true;
let params = { process: id, limit: "1000" }
let params = { process: id, limit: 1000 }
if (cursor) {
params["from"] = cursor
} else {
Expand Down
10 changes: 5 additions & 5 deletions src/services/dev.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ if (argv['dev']) {
console.log('*** DEV ENVIRONMENT ***')

process.env.GATEWAY_URL = 'https://arweave.net'
process.env.CU_URL = 'https://ao-cu-router-1.onrender.com'
process.env.MU_URL = 'https://ao-mu-router-1.onrender.com'
//process.env.SCHEDULER = 'TZ7o7SIZ06ZEJ14lXwVtng1EtSx60QkPy-kh-kdAXog'
process.env.CU_URL = 'https://ao-cu-0.ao-devnet.xyz'
process.env.MU_URL = 'https://ao-mu-0.ao-devnet.xyz'
process.env.SCHEDULER = 'gCpQfnG6nWLlKs8jYgV8oUfe38GYrPLv59AC7LCtCGg'

console.log('GATEWAY_URL', process.env.GATEWAY_URL)
console.log('CU', process.env.CU_URL)
console.log('MU', process.env.MU_URL)
console.log('SCHEDULER', process.env.SCHEDULER)
} else {
process.env.GATEWAY_URL ||= 'https://arweave.net'
process.env.CU_URL ||= 'https://cu.ao-testnet.xyz'
process.env.MU_URL ||= 'https://mu.ao-testnet.xyz'
process.env.CU_URL ||= 'https://cu.ao-testnet.xyz'
process.env.MU_URL ||= 'https://mu.ao-testnet.xyz'
}

export function dev() {
Expand Down
2 changes: 1 addition & 1 deletion src/services/version.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { getPkg } from './get-pkg.js'
import path from 'path'
import fs from 'fs'

const UPDATE_URL = 'https://get_ao.g8way.io'
const UPDATE_URL = process.env.UPDATE_URL || 'https://get_ao.arweave.net'
const pkg = getPkg()

export function version(id) {
Expand Down
49 changes: 28 additions & 21 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,28 +122,28 @@
resolved "https://registry.npmjs.org/@fastify/busboy/-/busboy-2.1.1.tgz"
integrity sha512-vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==

"@permaweb/ao-scheduler-utils@~0.0.13":
version "0.0.19"
resolved "https://registry.npmjs.org/@permaweb/ao-scheduler-utils/-/ao-scheduler-utils-0.0.19.tgz"
integrity sha512-xwIe9FqQ1UZxEYWvSGJDONz0xr4vDq2Ny1NeRUiO0dKYoonShN+oI1ULgrHocKOjOPNEgRX70vMCKGLe+3x70A==
"@permaweb/ao-scheduler-utils@~0.0.23":
version "0.0.24"
resolved "https://registry.yarnpkg.com/@permaweb/ao-scheduler-utils/-/ao-scheduler-utils-0.0.24.tgz#a7d2c1e09f9b6ea5d45127fa395bbbcef6688452"
integrity sha512-G6109Nz8+dQFPuG7mV8mz66kLVA+gl2uTSqU7qpaRwfujrWi6obM94CpmvyvAnrLo3dB29EYiuv7+KOKcns8ig==
dependencies:
lru-cache "^10.2.2"
ramda "^0.30.0"
zod "^3.23.5"

"@permaweb/aoconnect@^0.0.48":
version "0.0.48"
resolved "https://registry.npmjs.org/@permaweb/aoconnect/-/aoconnect-0.0.48.tgz"
integrity sha512-CldwoE+6STKrfvknnmozRDBlo5gSHXLhmfAtAqHZvbMRprZ3yk+N3OIAt8La5axQ8Rwte5KKRcltvrNyxZpsVA==
"@permaweb/aoconnect@^0.0.59":
version "0.0.59"
resolved "https://registry.yarnpkg.com/@permaweb/aoconnect/-/aoconnect-0.0.59.tgz#0ceb6257e2f376f4af6783163e3037240560dff1"
integrity sha512-AgnUv50hp3BVvqWk2IOw3p9ksF2GblFwQHCIWqwTYjvdViCPlsL4gx/BefxFqbMABXQ5q2QJItMJLlPelqC2CQ==
dependencies:
"@permaweb/ao-scheduler-utils" "~0.0.13"
"@permaweb/ao-scheduler-utils" "~0.0.23"
buffer "^6.0.3"
debug "^4.3.4"
debug "^4.3.6"
hyper-async "^1.1.2"
mnemonist "^0.39.8"
ramda "^0.29.1"
ramda "^0.30.1"
warp-arbundles "^1.0.4"
zod "^3.22.4"
zod "^3.23.8"

agent-base@^7.0.2:
version "7.1.1"
Expand Down Expand Up @@ -288,6 +288,13 @@ debug@4, debug@^4.3.4:
dependencies:
ms "2.1.2"

debug@^4.3.6:
version "4.3.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
dependencies:
ms "^2.1.3"

eastasianwidth@^0.2.0:
version "0.2.0"
resolved "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz"
Expand Down Expand Up @@ -435,6 +442,11 @@ [email protected]:
resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==

ms@^2.1.3:
version "2.1.3"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==

node-cron@^3.0.3:
version "3.0.3"
resolved "https://registry.npmjs.org/node-cron/-/node-cron-3.0.3.tgz"
Expand Down Expand Up @@ -487,14 +499,9 @@ queue-tick@^1.0.1:
resolved "https://registry.npmjs.org/queue-tick/-/queue-tick-1.0.1.tgz"
integrity sha512-kJt5qhMxoszgU/62PLP1CJytzd2NKetjSRnyuj31fDd3Rlcz3fzlFdFLD1SItunPwyqEOkca6GbV612BWfaBag==

ramda@^0.29.1:
version "0.29.1"
resolved "https://registry.npmjs.org/ramda/-/ramda-0.29.1.tgz"
integrity sha512-OfxIeWzd4xdUNxlWhgFazxsA/nl3mS4/jGZI5n00uWOoSSFRhC1b6gl6xvmzUamgmqELraWp0J/qqVlXYPDPyA==

ramda@^0.30.0:
ramda@^0.30.0, ramda@^0.30.1:
version "0.30.1"
resolved "https://registry.npmjs.org/ramda/-/ramda-0.30.1.tgz"
resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.30.1.tgz#7108ac95673062b060025052cd5143ae8fc605bf"
integrity sha512-tEF5I22zJnuclswcZMc8bDIrwRHRzf+NqVEmqg50ShAZMP7MWeR/RGDthfM/p+BlqvF2fXAzpn8i+SJcYD3alw==

readable-stream@^3.4.0:
Expand Down Expand Up @@ -684,7 +691,7 @@ yargs@^17.7.2:
y18n "^5.0.5"
yargs-parser "^21.1.1"

zod@^3.22.4, zod@^3.23.5:
zod@^3.23.5, zod@^3.23.8:
version "3.23.8"
resolved "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz"
resolved "https://registry.yarnpkg.com/zod/-/zod-3.23.8.tgz#e37b957b5d52079769fb8097099b592f0ef4067d"
integrity sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==
Loading