✨ Feat: Add back bytecode to evmts compiles

evmts · Nov 17, 2023 · 18111aa · 18111aa
1 parent 2f13396
commit 18111aa
Show file tree

Hide file tree

Showing 52 changed files with 494 additions and 136 deletions.
diff --git a/.changeset/happy-rocks-jump.md b/.changeset/happy-rocks-jump.md
@@ -0,0 +1,12 @@
+---
+"@evmts/ts-plugin": minor
+"@evmts/unplugin": minor
+"@evmts/runtime": minor
+"@evmts/core": minor
+"@evmts/base": minor
+"@evmts/solc": minor
+"@evmts/bun-plugin": minor
+"@evmts/bundler": minor
+---
+
+Added back bytecode to EVMts bundler. When the compiler encounters a file ending in .s.sol it will compile the bytecode in addition to the abi
diff --git a/bundler/base/docs/modules/bundler.md b/bundler/base/docs/modules/bundler.md
@@ -44,4 +44,4 @@
 
 #### Defined in
 
-[types.ts:32](https://github.com/evmts/evmts-monorepo/blob/main/bundler/base/src/types.ts#L32)
+[types.ts:34](https://github.com/evmts/evmts-monorepo/blob/main/bundler/base/src/types.ts#L34)
diff --git a/bundler/base/src/bundler.js b/bundler/base/src/bundler.js
@@ -9,7 +9,7 @@ export const bundler = (config, logger, fao) => {
 	return {
 		name: bundler.name,
 		config,
-		resolveDts: async (modulePath, basedir, includeAst) => {
+		resolveDts: async (modulePath, basedir, includeAst, includeBytecode) => {
 			try {
 				const { solcInput, solcOutput, artifacts, modules, asts } =
 					await resolveArtifacts(
@@ -18,14 +18,15 @@ export const bundler = (config, logger, fao) => {
 						logger,
 						config,
 						includeAst,
+						includeBytecode,
 						fao,
 					)
 				if (artifacts && Object.keys(artifacts).length > 0) {
 					return {
 						solcInput,
 						solcOutput,
 						asts,
-						code: runSync(generateRuntime(artifacts, 'dts')),
+						code: runSync(generateRuntime(artifacts, 'dts', includeBytecode)),
 						modules,
 					}
 				}
@@ -36,7 +37,7 @@ export const bundler = (config, logger, fao) => {
 				throw e
 			}
 		},
-		resolveDtsSync: (modulePath, basedir, includeAst) => {
+		resolveDtsSync: (modulePath, basedir, includeAst, includeBytecode) => {
 			try {
 				const { artifacts, modules, asts, solcInput, solcOutput } =
 					resolveArtifactsSync(
@@ -45,6 +46,7 @@ export const bundler = (config, logger, fao) => {
 						logger,
 						config,
 						includeAst,
+						includeBytecode,
 						fao,
 					)
 				if (artifacts && Object.keys(artifacts).length > 0) {
@@ -53,7 +55,7 @@ export const bundler = (config, logger, fao) => {
 						solcOutput,
 						asts,
 						modules,
-						code: runSync(generateRuntime(artifacts, 'dts')),
+						code: runSync(generateRuntime(artifacts, 'dts', includeBytecode)),
 					}
 				}
 				return { modules, code: '', asts, solcInput, solcOutput }
@@ -63,7 +65,7 @@ export const bundler = (config, logger, fao) => {
 				throw e
 			}
 		},
-		resolveTsModuleSync: (modulePath, basedir, includeAst) => {
+		resolveTsModuleSync: (modulePath, basedir, includeAst, includeBytecode) => {
 			try {
 				const { solcInput, solcOutput, asts, artifacts, modules } =
 					resolveArtifactsSync(
@@ -72,11 +74,12 @@ export const bundler = (config, logger, fao) => {
 						logger,
 						config,
 						includeAst,
+						includeBytecode,
 						fao,
 					)
 				let code = ''
 				if (artifacts && Object.keys(artifacts).length > 0) {
-					code = runSync(generateRuntime(artifacts, 'ts'))
+					code = runSync(generateRuntime(artifacts, 'ts', includeBytecode))
 				}
 				return { code, modules, solcInput, solcOutput, asts }
 			} catch (e) {
@@ -85,7 +88,12 @@ export const bundler = (config, logger, fao) => {
 				throw e
 			}
 		},
-		resolveTsModule: async (modulePath, basedir, includeAst) => {
+		resolveTsModule: async (
+			modulePath,
+			basedir,
+			includeAst,
+			includeBytecode,
+		) => {
 			try {
 				const { solcInput, solcOutput, asts, artifacts, modules } =
 					await resolveArtifacts(
@@ -94,11 +102,12 @@ export const bundler = (config, logger, fao) => {
 						logger,
 						config,
 						includeAst,
+						includeBytecode,
 						fao,
 					)
 				let code = ''
 				if (artifacts && Object.keys(artifacts).length > 0) {
-					code = runSync(generateRuntime(artifacts, 'ts'))
+					code = runSync(generateRuntime(artifacts, 'ts', includeBytecode))
 				}
 				return { code, modules, solcInput, solcOutput, asts }
 			} catch (e) {
@@ -107,7 +116,12 @@ export const bundler = (config, logger, fao) => {
 				throw e
 			}
 		},
-		resolveCjsModuleSync: (modulePath, basedir, includeAst) => {
+		resolveCjsModuleSync: (
+			modulePath,
+			basedir,
+			includeAst,
+			includeBytecode,
+		) => {
 			try {
 				const { solcInput, solcOutput, asts, artifacts, modules } =
 					resolveArtifactsSync(
@@ -116,11 +130,12 @@ export const bundler = (config, logger, fao) => {
 						logger,
 						config,
 						includeAst,
+						includeBytecode,
 						fao,
 					)
 				let code = ''
 				if (artifacts && Object.keys(artifacts).length > 0) {
-					code = runSync(generateRuntime(artifacts, 'cjs'))
+					code = runSync(generateRuntime(artifacts, 'cjs', includeBytecode))
 				}
 				return { code, modules, solcInput, solcOutput, asts }
 			} catch (e) {
@@ -129,7 +144,12 @@ export const bundler = (config, logger, fao) => {
 				throw e
 			}
 		},
-		resolveCjsModule: async (modulePath, basedir, includeAst) => {
+		resolveCjsModule: async (
+			modulePath,
+			basedir,
+			includeAst,
+			includeBytecode,
+		) => {
 			try {
 				const { solcInput, solcOutput, asts, artifacts, modules } =
 					await resolveArtifacts(
@@ -138,11 +158,12 @@ export const bundler = (config, logger, fao) => {
 						logger,
 						config,
 						includeAst,
+						includeBytecode,
 						fao,
 					)
 				let code = ''
 				if (artifacts && Object.keys(artifacts).length > 0) {
-					code = runSync(generateRuntime(artifacts, 'cjs'))
+					code = runSync(generateRuntime(artifacts, 'cjs', includeBytecode))
 				}
 				return { code, modules, solcInput, solcOutput, asts }
 			} catch (e) {
@@ -151,7 +172,12 @@ export const bundler = (config, logger, fao) => {
 				throw e
 			}
 		},
-		resolveEsmModuleSync: (modulePath, basedir, includeAst) => {
+		resolveEsmModuleSync: (
+			modulePath,
+			basedir,
+			includeAst,
+			includeBytecode,
+		) => {
 			try {
 				const { solcInput, solcOutput, asts, artifacts, modules } =
 					resolveArtifactsSync(
@@ -160,11 +186,12 @@ export const bundler = (config, logger, fao) => {
 						logger,
 						config,
 						includeAst,
+						includeBytecode,
 						fao,
 					)
 				let code = ''
 				if (artifacts && Object.keys(artifacts).length > 0) {
-					code = runSync(generateRuntime(artifacts, 'mjs'))
+					code = runSync(generateRuntime(artifacts, 'mjs', includeBytecode))
 				}
 				return { code, modules, solcInput, solcOutput, asts }
 			} catch (e) {
@@ -173,7 +200,12 @@ export const bundler = (config, logger, fao) => {
 				throw e
 			}
 		},
-		resolveEsmModule: async (modulePath, basedir, includeAst) => {
+		resolveEsmModule: async (
+			modulePath,
+			basedir,
+			includeAst,
+			includeBytecode,
+		) => {
 			try {
 				const { solcInput, solcOutput, asts, artifacts, modules } =
 					await resolveArtifacts(
@@ -182,11 +214,12 @@ export const bundler = (config, logger, fao) => {
 						logger,
 						config,
 						includeAst,
+						includeBytecode,
 						fao,
 					)
 				let code = ''
 				if (artifacts && Object.keys(artifacts).length > 0) {
-					code = runSync(generateRuntime(artifacts, 'mjs'))
+					code = runSync(generateRuntime(artifacts, 'mjs', includeBytecode))
 				}
 				return { code, modules, solcInput, solcOutput, asts }
 			} catch (e) {