ultimate-dominion · MrDeadCe11 · Jul 30, 2024 · Jul 29, 2024 · Jul 29, 2024 · Jul 29, 2024
diff --git a/packages/contracts/.solhint.json b/packages/contracts/.solhint.json
@@ -1,17 +1,40 @@
 {
-  "extends": ["solhint:recommended", "mud"],
-  "plugins": ["mud"],
+  "extends": [
+    "solhint:recommended",
+    "mud"
+  ],
+  "plugins": [
+    "mud"
+  ],
   "rules": {
-    "compiler-version": ["off"],
+    "compiler-version": [
+      "off"
+    ],
     "constructor-syntax": "warn",
-    "quotes": ["error", "single"],
-    "func-visibility": ["warn", { "ignoreConstructors": true }],
+    "quotes": [
+      "error",
+      "double"
+    ],
+    "func-visibility": [
+      "warn",
+      {
+        "ignoreConstructors": true
+      }
+    ],
     "not-rely-on-time": "off",
     "no-inline-assembly": "off",
     "no-empty-blocks": "off",
-    "private-vars-leading-underscore": ["warn", { "strict": false }],
+    "private-vars-leading-underscore": [
+      "warn",
+      {
+        "strict": false
+      }
+    ],
     "ordering": "warn",
     "avoid-low-level-calls": "off",
-    "max-line-length": ["warn", 120]
+    "max-line-length": [
+      "warn",
+      120
+    ]
   }
-}
+}
diff --git a/packages/contracts/foundry.toml b/packages/contracts/foundry.toml
@@ -8,6 +8,7 @@ verbosity = 2
 src = "src"
 test = "test"
 out = "out"
+target_evm = "cancun"
 allow_paths = [
   # pnpm symlinks to the project root's node_modules
   "../../node_modules",

diff --git a/packages/contracts/mud.config.ts b/packages/contracts/mud.config.ts
@@ -123,10 +123,10 @@ export default defineWorld({
     Counters: {
       schema: {
         contractAddress: "address",
-        mobId: "uint256",
+        counterId: "uint256",
         counter: "uint256",
       },
-      key: ["contractAddress", "mobId"],
+      key: ["contractAddress", "counterId"],
     },
     Items: {
       schema: {
@@ -186,41 +186,7 @@ export default defineWorld({
       },
       key: ["encounterId"],
     },
-    ActionOutcome: {
-      schema: {
-        encounterId: "bytes32",
-        currentTurn: "uint256",
-        actionNumber: "uint256",
-        actionId: "bytes32",
-        weaponId: "uint256",
-        attackerId: "bytes32",
-        defenderId: "bytes32",
-        hit: "bool",
-        miss: "bool",
-        crit: "bool",
-        attackerDamageDelt: "int256",
-        defenderDamageDelt: "int256",
-        attackerDied: "bool",
-        defenderDied: "bool",
-        blockNumber: "uint256",
-        timestamp: "uint256",
-      },
-      key: ["encounterId", "currentTurn", "actionNumber"],
-      type: "offchainTable",
-    },
-    CombatOutcome: {
-      schema: {
-        encounterId: "bytes32",
-        endTime: "uint256",
-        expDropped: "uint256",
-        goldDropped: "uint256",
-        itemsDropped: "uint256[]",
-        deadAttackers: "bytes32[]",
-        deadDefenders: "bytes32[]",
-      },
-      key: ["encounterId"],
-      type: "offchainTable",
-    },
+
     // when an entity starts combat it creates a "match entity" for that encounter.
     //when combat ends, the encounterId is set to zero, and the damage taken subtracted from the entities hp.
     MatchEntity: {
@@ -283,6 +249,57 @@ export default defineWorld({
         items: "address",
       },
     },
+    ///////////////////////// OFFCHAIN TABLES//////////////////
+    RngLogs: {
+      key: ["requestId"],
+      schema: {
+        requestId: "uint256",
+        sequenceNumber: "uint64",
+        provider: "address",
+        entropy: "address",
+        fee: "uint256",
+        requestType: "RngRequestType",
+        randomNumber: "uint256",
+        userRandomNumber: "bytes32",
+        data: "bytes",
+      },
+      type: "offchainTable",
+    },
+    ActionOutcome: {
+      schema: {
+        encounterId: "bytes32",
+        currentTurn: "uint256",
+        actionNumber: "uint256",
+        actionId: "bytes32",
+        weaponId: "uint256",
+        attackerId: "bytes32",
+        defenderId: "bytes32",
+        hit: "bool",
+        miss: "bool",
+        crit: "bool",
+        attackerDamageDelt: "int256",
+        defenderDamageDelt: "int256",
+        attackerDied: "bool",
+        defenderDied: "bool",
+        blockNumber: "uint256",
+        timestamp: "uint256",
+      },
+      key: ["encounterId", "currentTurn", "actionNumber"],
+      type: "offchainTable",
+    },
+    CombatOutcome: {
+      schema: {
+        encounterId: "bytes32",
+        endTime: "uint256",
+        expDropped: "uint256",
+        goldDropped: "uint256",
+        itemsDropped: "uint256[]",
+        deadAttackers: "bytes32[]",
+        deadDefenders: "bytes32[]",
+      },
+      key: ["encounterId"],
+      type: "offchainTable",
+    },
   },
   excludeSystems: ["RngSystem"],
 });
diff --git a/packages/contracts/out/CharacterSystem.sol/CharacterSystem.json b/packages/contracts/out/CharacterSystem.sol/CharacterSystem.json
diff --git a/packages/contracts/out/CombatSystem.sol/CombatSystem.json b/packages/contracts/out/CombatSystem.sol/CombatSystem.json
diff --git a/packages/contracts/out/EquipmentSystem.sol/EquipmentSystem.json b/packages/contracts/out/EquipmentSystem.sol/EquipmentSystem.json
diff --git a/packages/contracts/out/IWorld.sol/IWorld.json b/packages/contracts/out/IWorld.sol/IWorld.json
diff --git a/packages/contracts/out/MapSystem.sol/MapSystem.json b/packages/contracts/out/MapSystem.sol/MapSystem.json
diff --git a/packages/contracts/remappings.txt b/packages/contracts/remappings.txt
@@ -2,6 +2,7 @@ ds-test/=node_modules/ds-test/src/
 forge-std/=node_modules/forge-std/src/
 @latticexyz/=node_modules/@latticexyz/
 @pythnetwork/=node_modules/@pythnetwork/entropy-sdk-solidity/
+@chainlink/=lib/founcry-chainlink-toolkit/
 @test/=test/
 @systems/=src/systems/
 @interfaces/=src/interfaces/

diff --git a/packages/contracts/src/codegen/index.sol b/packages/contracts/src/codegen/index.sol
diff --git a/packages/contracts/src/codegen/tables/Counters.sol b/packages/contracts/src/codegen/tables/Counters.sol