Fixes for issues #1000 and #1002

dev-cli/container/src/node/src/bin/ao-spawn.js

@@ -14,12 +14,13 @@ const uploadAoProcess = spawnProcessWith({
   /**
    * implement to create a contract using the ao SDK
    */
-  create: async ({ module, tags, wallet }) => {
+  create: async ({ module, scheduler, tags, wallet }) => {
     return spawn({
-      moduleId: module,
+      module,
+      scheduler,
       tags,
       signer: createDataItemSigner(wallet)
-    }).then((contractId) => ({ contractId }))
+    }).then((processId) => ({ processId }))
   }
 })
 
@@ -35,6 +36,7 @@ Promise.resolve()
     uploadAoProcess({
       walletPath: process.env.WALLET_PATH,
       module: process.env.MODULE_TX,
+      scheduler: process.env.SCHEDULER_ADDRESS,
       tags: parseTags(process.env.TAGS || JSON.stringify([[], []]))
     })
   )

dev-cli/container/src/node/src/defaults.js

@@ -2,6 +2,8 @@ export const DEFAULT_MODULE_FORMAT_TAG = { name: 'Module-Format', value: 'wasm64
 export const DEFAULT_INPUT_ENCODING_TAG = { name: 'Input-Encoding', value: 'JSON-1' }
 export const DEFAULT_OUTPUT_ENCODING_TAG = { name: 'Output-Encoding', value: 'JSON-1' }
 export const DEFAULT_VARIANT_TAG = { name: 'Variant', value: 'ao.TN.1' }
+export const DEFAULT_MEMORY_LIMIT_TAG = {name: 'Memory-Limit', value: '1-gb' }
+export const DEFAULT_COMPUTE_LIMIT_TAG = {name: 'Compute-Limit', value: '9000000000000' }
 
 export const DEFAULT_BUNDLER_HOST = 'https://up.arweave.net'
 
@@ -12,5 +14,7 @@ export const AoModuleTags = [
   DEFAULT_INPUT_ENCODING_TAG,
   DEFAULT_OUTPUT_ENCODING_TAG,
   DEFAULT_VARIANT_TAG,
+  DEFAULT_MEMORY_LIMIT_TAG,
+  DEFAULT_COMPUTE_LIMIT_TAG,
   { name: 'Content-Type', value: 'application/wasm' }
 ]

dev-cli/container/src/node/src/main.js

@@ -165,12 +165,13 @@ export const uploadModuleWith =
  */
 export const spawnProcessWith =
   ({ walletExists, readWallet, create }) =>
-    async ({ walletPath, module, tags }) => {
+    async ({ walletPath, module, scheduler, tags }) => {
       if (!(await walletExists(walletPath))) throw new WalletNotFoundError()
 
       const wallet = await readWallet(walletPath)
       const res = await create({
         module,
+        scheduler,
         tags,
         wallet
       })

dev-cli/container/src/node/test/main.test.js

@@ -261,6 +261,7 @@ describe('createContractWith', () => {
     const res = await spawnProcess({
       walletPath: '/path/to/wallet.json',
       module: 'module-tx-123',
+      scheduler: 'scheduler-tx-123',
       tags: [
         { name: 'foo', value: 'bar' }
       ]
@@ -275,6 +276,7 @@ describe('createContractWith', () => {
       create: (params) => {
         assert.deepStrictEqual(params, {
           module: 'module-tx-123',
+          scheduler: 'scheduler-tx-123',
           tags: [
             { name: 'foo', value: 'bar' }
           ],
@@ -288,6 +290,7 @@ describe('createContractWith', () => {
     await spawnProcess({
       walletPath: '/path/to/wallet.json',
       module: 'module-tx-123',
+      scheduler: 'scheduler-tx-123',
       tags: [
         { name: 'foo', value: 'bar' }
       ]
@@ -303,6 +306,7 @@ describe('createContractWith', () => {
     await contract({
       walletPath: '/path/to/wallet.json',
       module: 'module-tx-123',
+      scheduler: 'scheduler-tx-123',
       tags: [
         { name: 'foo', value: 'bar' }
       ]

dev-cli/src/commands/bundler.js

@@ -11,10 +11,10 @@ function amountArgs (amount) {
   ]
 }
 
-export async function balance ({ wallet, host }) {
+export async function balance ({ wallet, bundler }) {
   const cmdArgs = [
     ...walletArgs(wallet),
-    ...bundlerArgs(host)
+    ...bundlerArgs(bundler)
   ]
 
   const p = Deno.run({

dev-cli/src/commands/init.js

@@ -19,10 +19,10 @@ export async function init ({ lang = 'lua' }, name) {
 
 export const command = new Command()
   .description('Create an ao Process Source Project')
-  .usage('-l cpp <my-project-name>')
+  .usage('-l c <my-project-name>')
   .option(
     '-l, --lang <language:string>',
-    'The starter to use. Defaults to Lua. Options are "lua" and "cpp"'
+    'The starter to use. Defaults to Lua. Options are "lua" and "c"'
   )
   .arguments('<name:string>')
   .action(init)

dev-cli/src/commands/spawn.js

@@ -4,22 +4,30 @@ import { Command } from '../deps.js'
 import { tagsArg, walletArgs } from '../utils.js'
 import { VERSION } from '../versions.js'
 
-function sourceArgs (src) {
+function moduleArgs (src) {
   return [
     '-e',
     `MODULE_TX=${src}`
   ]
 }
 
+function schedulerArgs (src) {
+  return [
+    '-e',
+    `SCHEDULER_ADDRESS=${src}`
+  ]
+}
+
 /**
  * TODO:
  * - Validate existence of wallet
  * - require confirmation and bypass with --yes
  */
-export async function spawn ({ wallet, tag, value, source }) {
+export async function spawn ({ wallet, tag, value, module, scheduler }) {
   const cmdArgs = [
     ...walletArgs(wallet),
-    ...sourceArgs(source),
+    ...moduleArgs(module),
+    ...schedulerArgs(scheduler),
     ...tagsArg({ tags: tag, values: value })
   ]
 
@@ -50,6 +58,11 @@ export const command = new Command()
     'the transaction that contains the ao Module',
     { required: true }
   )
+  .option(
+    '-s, --scheduler <address:string>',
+    'the ao scheduler address',
+    { required: true }
+  )
   .option(
     '-t, --tag <tag:string>',
     'additional tag to add to the transaction. MUST have a corresponding --value',