Skip to content

Commit

Permalink
Merge branch 'master' into dp/faucet-iframe
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dhaiwat10
Dhaiwat10 committed Aug 28, 2024
2 parents 001eba8 + 50d548c commit 94b0f2c
Show file tree
Hide file tree
Showing 32 changed files with 1,436 additions and 1,560 deletions.
5 changes: 5 additions & 0 deletions .changeset/fast-ties-crash.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@fuel-ts/utils": patch
---

fix: consistent typegen outputs
5 changes: 5 additions & 0 deletions .changeset/five-trees-clap.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"create-fuels": patch
---

build(deps): bump the deps-patch group across 1 directory
7 changes: 7 additions & 0 deletions .changeset/gorgeous-adults-divide.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
"@internal/fuel-core": patch
"@fuel-ts/versions": patch
"@fuel-ts/account": patch
---

chore: upgrade `[email protected]`
5 changes: 5 additions & 0 deletions .changeset/strong-pears-walk.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"create-fuels": patch
---

fix: added missing dependencies for templates
5 changes: 5 additions & 0 deletions .changeset/sweet-chefs-melt.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"create-fuels": patch
---

fix: UI integration tests
5 changes: 5 additions & 0 deletions .changeset/thin-beans-act.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@fuel-ts/utils": patch
---

chore: made `chainConfig` files match testnet configuration
116 changes: 58 additions & 58 deletions .fuel-core/configs/chainConfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"max_inputs": 255,
"max_outputs": 255,
"max_witnesses": 255,
"max_gas_per_tx": 100000000,
"max_gas_per_tx": 30000000,
"max_size": 262144,
"max_bytecode_subsections": 256
}
Expand All @@ -17,7 +17,7 @@
"max_predicate_length": 102400,
"max_predicate_data_length": 102400,
"max_message_data_length": 102400,
"max_gas_per_predicate": 100000000
"max_gas_per_predicate": 30000000
}
},
"script_params": {
Expand All @@ -34,7 +34,7 @@
},
"fee_params": {
"V1": {
"gas_price_factor": 92,
"gas_price_factor": 92000,
"gas_per_byte": 63
}
},
Expand Down Expand Up @@ -79,8 +79,9 @@
"lw": 2,
"mint": 18042,
"mlog": 2,
"mod": 2,
"modi": 2,
"mod_op": 2,
"move": 2,
"movi": 2,
"mroo": 4,
"mul": 2,
Expand All @@ -94,8 +95,8 @@
"popl": 3,
"pshh": 5,
"pshl": 5,
"move_op": 2,
"ret": 53,
"ret_contract": 53,
"rvrt_contract": 52,
"sb": 2,
"sll": 2,
"slli": 2,
Expand Down Expand Up @@ -125,11 +126,10 @@
"wqmm": 8,
"xor": 2,
"xori": 2,
"rvrt": 2,
"aloc": {
"HeavyOperation": {
"LightOperation": {
"base": 2,
"gas_per_unit": 0
"units_per_gas": 15
}
},
"bsiz": {
Expand All @@ -145,154 +145,154 @@
}
},
"cfe": {
"HeavyOperation": {
"base": 2,
"gas_per_unit": 0
"LightOperation": {
"base": 10,
"units_per_gas": 1818181
}
},
"cfei": {
"HeavyOperation": {
"LightOperation": {
"base": 2,
"gas_per_unit": 0
"units_per_gas": 1000000
}
},
"call": {
"LightOperation": {
"base": 18190,
"units_per_gas": 5
"base": 13513,
"units_per_gas": 7
}
},
"ccp": {
"LightOperation": {
"base": 48,
"units_per_gas": 22
"base": 34,
"units_per_gas": 39
}
},
"croo": {
"LightOperation": {
"base": 131,
"units_per_gas": 2
"base": 91,
"units_per_gas": 3
}
},
"csiz": {
"LightOperation": {
"base": 45,
"units_per_gas": 237
"base": 31,
"units_per_gas": 438
}
},
"ed19": {
"LightOperation": {
"base": 45,
"units_per_gas": 237
"base": 3000,
"units_per_gas": 214
}
},
"k256": {
"LightOperation": {
"base": 37,
"units_per_gas": 3
"base": 27,
"units_per_gas": 5
}
},
"ldc": {
"LightOperation": {
"base": 39,
"units_per_gas": 68
"base": 43,
"units_per_gas": 102
}
},
"logd": {
"LightOperation": {
"base": 565,
"units_per_gas": 2
"base": 363,
"units_per_gas": 4
}
},
"mcl": {
"LightOperation": {
"base": 3,
"units_per_gas": 564
"base": 2,
"units_per_gas": 1041
}
},
"mcli": {
"LightOperation": {
"base": 3,
"units_per_gas": 560
"base": 2,
"units_per_gas": 1025
}
},
"mcp": {
"LightOperation": {
"base": 4,
"units_per_gas": 185
"units_per_gas": 325
}
},
"mcpi": {
"LightOperation": {
"base": 9,
"units_per_gas": 455
"base": 8,
"units_per_gas": 511
}
},
"meq": {
"LightOperation": {
"base": 3,
"units_per_gas": 766
"units_per_gas": 940
}
},
"retd": {
"retd_contract": {
"LightOperation": {
"base": 485,
"units_per_gas": 3
"base": 305,
"units_per_gas": 4
}
},
"s256": {
"LightOperation": {
"base": 42,
"units_per_gas": 3
"base": 31,
"units_per_gas": 4
}
},
"scwq": {
"HeavyOperation": {
"base": 21672,
"gas_per_unit": 22146
"base": 16346,
"gas_per_unit": 17163
}
},
"smo": {
"LightOperation": {
"base": 44437,
"units_per_gas": 1
"base": 40860,
"units_per_gas": 2
}
},
"srwq": {
"HeavyOperation": {
"base": 239,
"gas_per_unit": 234
"base": 187,
"gas_per_unit": 179
}
},
"swwq": {
"HeavyOperation": {
"base": 22724,
"gas_per_unit": 21231
"base": 17046,
"gas_per_unit": 16232
}
},
"contract_root": {
"LightOperation": {
"base": 42,
"base": 31,
"units_per_gas": 2
}
},
"state_root": {
"HeavyOperation": {
"base": 323,
"gas_per_unit": 169
"base": 236,
"gas_per_unit": 122
}
},
"new_storage_per_byte": 63,
"vm_initialization": {
"HeavyOperation": {
"base": 5254820,
"gas_per_unit": 0
"LightOperation": {
"base": 3957,
"units_per_gas": 48
}
}
}
},
"base_asset_id": "0xf8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07",
"block_gas_limit": 100000000,
"block_gas_limit": 30000000,
"privileged_address": "0000000000000000000000000000000000000000000000000000000000000000"
}
},
Expand Down
14 changes: 8 additions & 6 deletions apps/create-fuels-counter-guide/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,26 @@
"postbuild": "run-s fuels:build original:build"
},
"dependencies": {
"@fuels/connectors": "^0.25.0",
"@fuels/react": "^0.25.0",
"@fuels/connectors": "^0.26.0",
"@fuels/react": "^0.26.0",
"fuels": "workspace:*",
"@tanstack/react-query": "^5.51.23",
"@tanstack/react-query": "^5.52.1",
"@wagmi/connectors": "^5.1.7",
"@wagmi/core": "^2.13.4",
"dotenv": "^16.4.5",
"next": "14.2.5",
"next": "14.2.6",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hot-toast": "^2.4.1",
"react-use": "^17.5.1"
},
"devDependencies": {
"@types/node": "^22.2.0",
"@types/react": "^18.3.3",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3",
"autoprefixer": "^10.4.20",
"eslint": "^8.57.0",
"eslint-config-next": "14.2.5",
"eslint-config-next": "14.2.6",
"postcss": "^8",
"tailwindcss": "^3.4.10",
"typescript": "~5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion apps/demo-bun-fuels/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
"fuels": "workspace:*"
},
"devDependencies": {
"bun": "^1.1.24"
"bun": "^1.1.26"
}
}
4 changes: 2 additions & 2 deletions apps/demo-nextjs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"@fuels/vm-asm": "0.56.0",
"@types/node": "^22.2.0",
"@types/react-dom": "^18.3",
"@types/react": "^18.3.3",
"@types/react": "^18.3.4",
"fuels": "workspace:*",
"next": "14.2.5",
"next": "14.2.6",
"react-dom": "^18.3.1",
"react": "^18.3.1",
"typescript": "~5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion apps/demo-react-cra/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"@fuels/vm-asm": "0.56.0",
"@testing-library/react": "^16.0.0",
"@types/node": "^22.2.0",
"@types/react": "^18.3.3",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3",
"eslint-config-react-app": "^7.0.1",
"fuels": "workspace:*",
Expand Down
6 changes: 3 additions & 3 deletions apps/demo-react-vite/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
"react": "^18.3.1"
},
"devDependencies": {
"@types/react": "^18.3.3",
"@types/react": "^18.3.4",
"@types/react-dom": "^18.3",
"@typescript-eslint/eslint-plugin": "^6.9.0",
"@typescript-eslint/parser": "^6.21.0",
"@vitejs/plugin-react": "^4.3.1",
"eslint": "^8.57.0",
"eslint-plugin-react-hooks": "^4.6.2",
"eslint-plugin-react-refresh": "^0.4.9",
"eslint-plugin-react-refresh": "^0.4.11",
"typescript": "~5.4.5",
"vite": "^5.4.1"
"vite": "^5.4.2"
}
}
Loading

0 comments on commit 94b0f2c

Please sign in to comment.