fix(sdk): Fixing SDK build

Author: ogarciarevett

.gitignore

@@ -163,3 +163,6 @@ package-lock.json
 scm/srv/
 scm/pwfile
 
+# ides
+.idea
+

.prettierrc

@@ -0,0 +1,5 @@
+{
+  "trailingComma": "es5",
+  "tabWidth": 4,
+  "semi": false
+}

package.json

@@ -1,5 +1,8 @@
 {
   "private": true,
+  "engines": {
+    "node": "16"
+  },
   "scripts": {
     "generate_classes": "typechain --target=web3-v1 --out-dir types/contracts 'build/contracts/*.json'"
   },

sdk/.eslintrc.js

@@ -1,15 +1,10 @@
-
 module.exports = {
     env: {
         browser: false,
         es6: true,
         node: true,
     },
     parser: "@typescript-eslint/parser",
-    parserOptions: {
-        project: `${__dirname}/tsconfig.json`,
-        sourceType: "module",
-    },
     rules: {
         "prettier/prettier": "error",
     },

sdk/README.md

@@ -0,0 +1,18 @@
+# Setup
+
+
+Add this var envs:
+
+export RPC_URL="your_rpc_url_here"
+export PRIVATE_KEY="your_testnet_private_wallet_key"
+
+
+# how test this?
+
+1. `yarn` / `yarn install`
+1. `yarn example`
+
+*or*
+
+1. `yarn build`
+2. `node lib/example`

sdk/package.json

@@ -2,14 +2,17 @@
   "name": "@moonstream/engine",
   "version": "0.0.1",
   "description": "SDK for moonstream engine",
-  "main": "index.ts",
+  "main": "lib/index.js",
+  "types": "lib/index.d.ts",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "build": "tsc",
+    "example": "ts-node ./src/example.ts"
   },
   "author": "moonstream",
   "license": "ISC",
   "devDependencies": {
     "@typechain/ethers-v5": "^10.1.0",
+    "ts-node": "^10.9.1",
     "typechain": "^8.1.0",
     "typescript": "^4.7.4"
   },

sdk/src/CraftingContract.ts

@@ -11,9 +11,7 @@ import {
     CraftingRecipe,
     CraftingInputActions,
     CraftingOutputActions,
-    ERC20Item,
     ERC1155Item,
-    CraftingItem,
     CraftingInput,
     CraftingOutput,
 } from "./types/CraftingTypes"
@@ -101,43 +99,36 @@ export class CraftingContract {
     }
 
     public async addRecipe(
-        recipe: CraftingRecipe,
-        overrides?: ethers.Overrides
+        recipe: CraftingRecipe
+        // overrides?: ethers.Overrides
     ): Promise<ethers.BigNumber> {
-        let craftingInputs = recipe.craftingInputs.map(
-            (el): CraftingInputItemStruct => {
-                return {
-                    tokenType: "tokenId" in el.item ? 1155 : 20,
-                    tokenAddress: el.item.tokenAddrress,
-                    tokenId:
-                        "tokenId" in el.item
-                            ? (el.item as ERC1155Item).tokenId
-                            : 0,
-                    amount: el.item.amount,
-                    tokenAction: el.action,
-                }
-            }
+        const craftingInputs = recipe.craftingInputs.map(
+            (el): CraftingInputItemStruct => ({
+                tokenType: "tokenId" in el.item ? 1155 : 20,
+                tokenAddress: el.item.tokenAddrress,
+                tokenId:
+                    "tokenId" in el.item ? (el.item as ERC1155Item).tokenId : 0,
+                amount: el.item.amount,
+                tokenAction: el.action,
+            })
         )
-        let craftingOutputs = recipe.craftingOutputs.map(
-            (el): CraftingOutputItemStruct => {
-                return {
-                    tokenType: "tokenId" in el.item ? 1155 : 20,
-                    tokenAddress: el.item.tokenAddrress,
-                    tokenId:
-                        "tokenId" in el.item
-                            ? (el.item as ERC1155Item).tokenId
-                            : 0,
-                    amount: el.item.amount,
-                    tokenAction: el.action,
-                }
-            }
+        const craftingOutputs = recipe.craftingOutputs.map(
+            (el): CraftingOutputItemStruct => ({
+                tokenType: "tokenId" in el.item ? 1155 : 20,
+                tokenAddress: el.item.tokenAddrress,
+                tokenId:
+                    "tokenId" in el.item ? (el.item as ERC1155Item).tokenId : 0,
+                amount: el.item.amount,
+                tokenAction: el.action,
+            })
         )
-        let recipeStruct: RecipeStruct = {
+        const recipeStruct: RecipeStruct = {
             inputs: craftingInputs,
             outputs: craftingOutputs,
             isActive: recipe.isActive,
         }
-        await (await this.contract.addRecipe(recipeStruct, overrides)).wait(1)
+        const tx = await this.contract.addRecipe(recipeStruct)
+        await tx.wait(1)
         return this.numRecipes()
     }
     public connect(_signer: ethers.Signer) {

sdk/src/contract-types/CraftingFacet.ts

@@ -274,8 +274,8 @@ export interface CraftingFacet extends BaseContract {
   };
 
   addRecipe(
-    recipe: RecipeStruct,
-    overrides?: Overrides & { from?: PromiseOrValue<string> }
+    recipe: RecipeStruct
+    // overrides?: Overrides & { from?: PromiseOrValue<string> }
   ): Promise<ContractTransaction>;
 
   craft(

sdk/src/example.ts

@@ -9,50 +9,53 @@ import {
 } from "./index"
 
 async function main() {
-    let rpcUrl = process.env.RPC_URL
+    const rpcUrl = process.env.RPC_URL
+    const privateKey = process.env.PRIVATE_KEY
+
     if (!rpcUrl) {
         throw new Error("RPC_URL env var is not set")
     }
+
+    if (!privateKey) {
+        throw new Error("PRIVATE_KEY env var is not set")
+    }
+
     const provider = new ethers.providers.JsonRpcProvider(rpcUrl)
 
-    let craftingContract = new CraftingContract(
+    const craftingContract = new CraftingContract(
         "0x8EA6A5EE9B9f7BCa384D804a12180473Ae4BE297",
         provider
     )
 
-    let recipesCount = await craftingContract.numRecipes()
+    const recipesCount = await craftingContract.numRecipes()
     console.log(`There are ${recipesCount} recipes on this contract`)
     for (let i = 1; i <= recipesCount.toNumber(); ++i) {
         console.log(JSON.stringify(await craftingContract.getRecipe(i)))
         console.log()
     }
 
-    let privateKey = process.env.PRIVATE_KEY
-    if (!privateKey) {
-        throw new Error("PRIVATE_KEY env var is not set")
-    }
     const signer = new ethers.Wallet(privateKey, provider)
 
     craftingContract.connect(signer)
 
-    let emptyBottle: CraftingItem = {
+    const emptyBottle: CraftingItem = {
         tokenAddrress: "0x0000000000000000000000000000000000000000",
         amount: "1",
         tokenId: "1",
     }
 
-    let milk: CraftingItem = {
+    const milk: CraftingItem = {
         tokenAddrress: "0x0000000000000000000000000000000000000000",
         amount: "100000000000000000000", // 100 * 10^18, 100 unim
     }
 
-    let fullBottle: CraftingItem = {
+    const fullBottle: CraftingItem = {
         tokenAddrress: "0x0000000000000000000000000000000000000000",
         amount: "1",
         tokenId: "2",
     }
 
-    let bottlingRecipe: CraftingRecipe = {
+    const bottlingRecipe: CraftingRecipe = {
         isActive: true,
         craftingInputs: [
             {
@@ -72,10 +75,10 @@ async function main() {
         ],
     }
     console.log("Adding bottling contract")
-    let recipeId = await craftingContract.addRecipe(bottlingRecipe)
+    const recipeId = await craftingContract.addRecipe(bottlingRecipe)
     console.log(`Bottling recipe is created with id: ${recipeId}`)
 
-    let unbottlingRecipe: CraftingRecipe = {
+    const unbottlingRecipe: CraftingRecipe = {
         isActive: true,
         craftingInputs: [
             {
@@ -96,7 +99,9 @@ async function main() {
     }
 
     console.log("Adding unbottling contract")
-    let unbottlingRecipeId = await craftingContract.addRecipe(unbottlingRecipe)
+    const unbottlingRecipeId = await craftingContract.addRecipe(
+        unbottlingRecipe
+    )
     console.log(`Unbottling recipe is created with id: ${unbottlingRecipeId}`)
 }