Fix compile errors

packages/core-cairo/src/api.ts

@@ -3,7 +3,6 @@ import { printERC20, defaults as erc20defaults, isAccessControlRequired as erc20
 // import { printERC721, defaults as erc721defaults, isAccessControlRequired as erc721IsAccessControlRequired, ERC721Options } from './erc721';
 // import { printERC1155, defaults as erc1155defaults, isAccessControlRequired as erc1155IsAccessControlRequired, ERC1155Options } from './erc1155';
 // import { printCustom, defaults as customDefaults, isAccessControlRequired as customIsAccessControlRequired, CustomOptions } from './custom';
-import { toUint256 } from './utils/uint256';
 
 export interface WizardContractAPI<Options extends CommonOptions> {
   /**
@@ -54,6 +53,3 @@ export const erc20: ERC20 = {
 //   defaults: customDefaults,
 //   isAccessControlRequired: customIsAccessControlRequired
 // }
-export const utils = {
-  toUint256
-}

packages/core-cairo/src/build-generic.ts

@@ -26,8 +26,8 @@ export function buildGeneric(opts: GenericOptions) {
     // case 'Custom':
     //   return buildCustom(opts);
 
-    default:
-      const _: never = opts;
-      throw new Error('Unknown ERC');
+    // default:
+    //   const _: never = opts;
+    //   throw new Error('Unknown ERC');
   }
 }

packages/core-cairo/src/contract.test.ts

@@ -1,75 +1,75 @@
 import test from 'ava';
 
-import { BaseFunction, ContractBuilder } from './contract';
+import { ContractFunction, ContractBuilder } from './contract';
 import { printContract } from './print';
 
 test('contract basics', t => {
-  const Foo = new ContractBuilder();
+  const Foo = new ContractBuilder("foo");
   t.snapshot(printContract(Foo));
 });
 
 test('contract with constructor code', t => {
-  const Foo = new ContractBuilder();
+  const Foo = new ContractBuilder("foo");
   Foo.addConstructorCode('someFunction()');
   t.snapshot(printContract(Foo));
 });
 
 test('contract with constructor code with semicolon', t => {
-  const Foo = new ContractBuilder();
+  const Foo = new ContractBuilder("foo");
   Foo.addConstructorCode('someFunction();');
   t.snapshot(printContract(Foo));
 });
 
-test('contract with function code', t => {
-  const Foo = new ContractBuilder();
-  Foo.addFunctionCode('someFunction()', _otherFunction);
-  t.snapshot(printContract(Foo));
-});
+// test('contract with function code', t => {
+//   const Foo = new ContractBuilder("foo");
+//   Foo.addFunctionCode('someFunction()', _otherFunction);
+//   t.snapshot(printContract(Foo));
+// });
 
-test('contract with function code with semicolon', t => {
-  const Foo = new ContractBuilder();
-  Foo.addFunctionCode('someFunction();', _otherFunction);
-  t.snapshot(printContract(Foo));
-});
+// test('contract with function code with semicolon', t => {
+//   const Foo = new ContractBuilder();
+//   Foo.addFunctionCode('someFunction();', _otherFunction);
+//   t.snapshot(printContract(Foo));
+// });
 
-test('contract with initializer params', t => {
-  const Foo = new ContractBuilder();
-  Foo.addComponent(
-    someModule,
-    ['param1'],
-    [],
-    true
-  );
-  t.snapshot(printContract(Foo));
-});
+// test('contract with initializer params', t => {
+//   const Foo = new ContractBuilder();
+//   Foo.addComponent(
+//     someModule,
+//     ['param1'],
+//     [],
+//     true
+//   );
+//   t.snapshot(printContract(Foo));
+// });
 
-test('contract with library call', t => {
-  const Foo = new ContractBuilder();
-  Foo.addComponent(
-    someModule,
-    [],
-    [],
-    false
-  );
-  Foo.addFunction(_libraryFunction);
-  t.snapshot(printContract(Foo));
-});
+// test('contract with library call', t => {
+//   const Foo = new ContractBuilder();
+//   Foo.addComponent(
+//     someModule,
+//     [],
+//     [],
+//     false
+//   );
+//   Foo.addFunction(_libraryFunction);
+//   t.snapshot(printContract(Foo));
+// });
 
-const someModule = {
-  name: 'SomeLibrary',
-  path: 'contracts/some/library',
-  useNamespace: true
-};
+// const someModule = {
+//   name: 'SomeLibrary',
+//   path: 'contracts/some/library',
+//   useNamespace: true
+// };
 
-const _otherFunction: BaseFunction = {
-  name: 'otherFunction',
-  kind: 'external',
-  args: [],
-};
+// const _otherFunction: BaseFunction = {
+//   name: 'otherFunction',
+//   kind: 'external',
+//   args: [],
+// };
 
-const _libraryFunction: BaseFunction = {
-  module: someModule,
-  name: 'libraryFunction',
-  kind: 'external',
-  args: [],
-};
+// const _libraryFunction: BaseFunction = {
+//   module: someModule,
+//   name: 'libraryFunction',
+//   kind: 'external',
+//   args: [],
+// };

packages/core-cairo/src/erc20.ts

@@ -9,7 +9,6 @@ import { OptionsError } from './error';
 import { defineComponents } from './utils/define-components';
 import { defaults as commonDefaults } from './common-options';
 import { printContract } from './print';
-import { importUint256, NumberTooLarge, toUint256 } from './utils/uint256';
 // import { importGetCallerAddress } from './common-functions';
 
 export const defaults: Required<ERC20Options> = {

packages/core-cairo/src/generate/erc20.ts

@@ -10,17 +10,13 @@ const blueprint = {
   name: ['MyToken'],
   symbol: ['MTK'],
   burnable: booleans,
-  snapshots: booleans,
   pausable: booleans,
   mintable: booleans,
-  permit: booleans,
-  votes: booleans,
-  flashmint: booleans,
+  safeAllowance: booleans,
   premint: ['1'],
   access: accessOptions,
   upgradeable: upgradeableOptions,
-  info: infoOptions,
-  decimals: ['18']
+  info: infoOptions
 };
 
 export function* generateERC20Options(): Generator<Required<ERC20Options>> {

packages/core-cairo/src/generate/sources.ts

@@ -3,8 +3,8 @@ import path from 'path';
 import crypto from 'crypto';
 
 import { generateERC20Options } from './erc20';
-import { generateERC721Options } from './erc721';
-import { generateCustomOptions } from './custom';
+// import { generateERC721Options } from './erc721';
+// import { generateCustomOptions } from './custom';
 import { buildGeneric, GenericOptions } from '../build-generic';
 import { printContract } from '../print';
 import { OptionsError } from '../error';
@@ -18,13 +18,13 @@ export function* generateOptions(): Generator<GenericOptions> {
     yield { kind: 'ERC20', ...kindOpts };
   }
 
-  for (const kindOpts of generateERC721Options()) {
-    yield { kind: 'ERC721', ...kindOpts };
-  }
+  // for (const kindOpts of generateERC721Options()) {
+  //   yield { kind: 'ERC721', ...kindOpts };
+  // }
 
-  for (const kindOpts of generateCustomOptions()) {
-    yield { kind: 'Custom', ...kindOpts };
-  }
+  // for (const kindOpts of generateCustomOptions()) {
+  //   yield { kind: 'Custom', ...kindOpts };
+  // }
 }
 
 interface GeneratedContract {
@@ -62,7 +62,7 @@ function generateContractSubset(subset: Subset): GeneratedContract[] {
   if (subset === 'all') {
     return contracts;
   } else {
-    const getParents = (c: GeneratedContract) => c.contract.components.map(p => p.module.path);
+    const getParents = (c: GeneratedContract) => c.contract.components.map(p => p.path);
     return [
       ...findCover(contracts.filter(c => c.options.upgradeable), getParents),
       ...findCover(contracts.filter(c => !c.options.upgradeable), getParents),

packages/core-cairo/src/index.ts

@@ -22,4 +22,4 @@ export { sanitizeKind } from './kind';
 
 export { contractsVersion, contractsVersionTag } from './utils/version';
 
-export { erc20, utils } from './api';
+export { erc20 } from './api';

packages/core-cairo/src/print.ts

@@ -10,8 +10,6 @@ import { getSelfArg } from './common-options';
 
 export function printContract(contract: Contract): string {
 
-  console.log('printing contract', contract);
-
   const fns = contract.functions.map(fn => printFunction(fn));
 
   // const hasViews = fns.views.some(l => l.length > 0);

packages/core-cairo/src/test.ts

@@ -2,16 +2,16 @@ import test from 'ava';
 
 import { generateSources } from './generate/sources';
 import type { GenericOptions } from './build-generic';
-import { custom, erc20, erc721 } from './api';
+import { /*custom,*/ erc20, /*erc721*/ } from './api';
 
 function isAccessControlRequired(opts: GenericOptions) {
   switch(opts.kind) {
     case 'ERC20':
       return erc20.isAccessControlRequired(opts);
-    case 'ERC721':
-      return erc721.isAccessControlRequired(opts);
-    case 'Custom':
-      return custom.isAccessControlRequired(opts);
+    // case 'ERC721':
+    //   return erc721.isAccessControlRequired(opts);
+    // case 'Custom':
+    //   return custom.isAccessControlRequired(opts);
     default:
       throw new Error("No such kind");
   }