Merge branch 'main' into anmol/docs-first-contract

hyperweb-io · Nov 11, 2024 · d88f981 · d88f981
2 parents 5570230 + 5519044
commit d88f981
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -50,6 +50,15 @@ git clone https://github.com/hyperweb-io/hyperweb-boilerplate.git
 yarn
 ```
 
+## Repository overview
+
+* `src/`: Contains source code for each contract, with each sub-directory as a separate contract.
+  * `simple-state`: A simple contract to demonstrate state transitions.
+  * `amm-contract`: An automated market maker contract using the Bank module.
+* `scripts/`: Holds the build script to create contract bundles.
+* `__tests__/`: Includes test cases to validate contract functionality.
+* `dist/`: Output folder for bundled contracts ready for deployment.
+
 ## Quickstart
 
 ### Bundle Contracts

diff --git a/__tests__/contract2.test.ts → __tests__/ammContract.test.ts b/__tests__/contract2.test.ts → __tests__/ammContract.test.ts
@@ -73,7 +73,7 @@ describe('Contract 2: AMM contract test', () => {
 
   it('instantiate contract', async () => {
     // Read contract code from external file
-    const contractPath = path.join(__dirname, '../dist/contracts/bundle2.js');
+    const contractPath = path.join(__dirname, '../dist/contracts/ammContract.js');
     contractCode = fs.readFileSync(contractPath, 'utf8');
 
     const msg = jsd.jsd.MessageComposer.fromPartial.instantiate({

diff --git a/__tests__/first.test.ts b/__tests__/first.test.ts
diff --git a/__tests__/contract1.test.ts → __tests__/simpleState.test.ts b/__tests__/contract1.test.ts → __tests__/simpleState.test.ts
@@ -57,7 +57,7 @@ describe('JSD tests', () => {
 
   it('instantiate contract', async () => {
     // Read contract code from external file
-    const contractPath = path.join(__dirname, '../dist/contracts/bundle1.js');
+    const contractPath = path.join(__dirname, '../dist/contracts/simpleState.js');
     contractCode = fs.readFileSync(contractPath, 'utf8');
 
     const msg = jsd.jsd.MessageComposer.fromPartial.instantiate({

diff --git a/configs/ci.yaml b/configs/ci.yaml
@@ -13,14 +13,15 @@ chains:
       faucet: 8000
       exposer: 8001
     resources:
-      cpu: "0.3"
-      memory: "300M"
+      cpu: "0.4"
+      memory: "400M"
     faucet:
       enabled: true
       type: starship
+      concurrency: 2
       resources:
-        cpu: "0.1"
-        memory: "100M"
+        cpu: "0.2"
+        memory: "200M"
 
 registry:
   enabled: true

diff --git a/dist/contracts/bundle2.js → dist/contracts/ammContract.js b/dist/contracts/bundle2.js → dist/contracts/ammContract.js
diff --git a/dist/contracts/bundle2.js.map → dist/contracts/ammContract.js.map b/dist/contracts/bundle2.js.map → dist/contracts/ammContract.js.map
diff --git a/dist/contracts/bundle1.js → dist/contracts/simpleState.js b/dist/contracts/bundle1.js → dist/contracts/simpleState.js
diff --git a/dist/contracts/bundle1.js.map → dist/contracts/simpleState.js.map b/dist/contracts/bundle1.js.map → dist/contracts/simpleState.js.map
diff --git a/scripts/build.ts b/scripts/build.ts
@@ -9,13 +9,13 @@ interface BuildConfig {
 
 const configs: BuildConfig[] = [
   {
-    entryFile: 'src/contract1/index.ts',
-    outFile: 'dist/contracts/bundle1.js',
+    entryFile: 'src/simple-state/index.ts',
+    outFile: 'dist/contracts/simpleState.js',
     externalPackages: ['otherpackage', '~somepackage']
   },
   {
-    entryFile: 'src/contract2/index.ts',
-    outFile: 'dist/contracts/bundle2.js',
+    entryFile: 'src/amm-contract/index.ts',
+    outFile: 'dist/contracts/ammContract.js',
     externalPackages: ['~bank'],
   }
 ];

diff --git a/src/contract2/amm.ts → src/amm-contract/amm.ts b/src/contract2/amm.ts → src/amm-contract/amm.ts
diff --git a/src/contract2/index.ts → src/amm-contract/index.ts b/src/contract2/index.ts → src/amm-contract/index.ts
diff --git a/src/contract2/sdk.ts → src/amm-contract/sdk.ts b/src/contract2/sdk.ts → src/amm-contract/sdk.ts
diff --git a/src/contract2/types.ts → src/amm-contract/types.ts b/src/contract2/types.ts → src/amm-contract/types.ts
diff --git a/src/contract1/index.ts → src/simple-state/index.ts b/src/contract1/index.ts → src/simple-state/index.ts