Fix conflicts in contracts

contracts/.github/workflows/build-and-test.yml

@@ -0,0 +1,44 @@
+name: Build and Test Workflow
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Set up Node.js
+      uses: actions/setup-node@v2
+      with:
+        node-version: '18' # Adjust this as needed for your project
+
+    - name: Install dependencies
+      run: npm install
+
+    - name: Install Foundry
+      run: |
+        curl -L https://foundry.paradigm.xyz | bash
+        export PATH="$PATH:/home/runner/.config/.foundry/bin"
+        foundryup
+        forge install
+
+    - name: Generate Ethereum Private Key and Create .env File and run make
+      run: |
+        PRIVATE_KEY=$(node -e "console.log(require('crypto').randomBytes(32).toString('hex'))")
+        echo "export PRIVATE_KEY=0x$PRIVATE_KEY" > .env
+        echo "export RPC_URL=http://127.0.0.1:1337" >> .env
+        echo "export CHAIN_ID=1337" >> .env
+        export PATH="$PATH:/home/runner/.config/.foundry/bin"
+        npx ganache-cli -g0 -p1337 --account 0x$PRIVATE_KEY,1001901919191919191  &
+        sleep 5
+        make
+
+

contracts/.out/AccountHelper.sol/AccountHelper.json

@@ -0,0 +1 @@
+{"abi":[{"type":"function","name":"isSystemActor","inputs":[{"name":"_address","type":"address","internalType":"address"}],"outputs":[{"name":"","type":"bool","internalType":"bool"}],"stateMutability":"pure"}],"bytecode":{"object":"0x60808060405234601857608e908161001e823930815050f35b600080fdfe6080806040526004361015601257600080fd5b60003560e01c635d3f8a6914602657600080fd5b60203660031901126053576004356001600160a01b038116919082900360535760209160ff60981b148152f35b600080fdfea2646970667358221220a68cfeb6ce6fe5ab87c1d872ad609dc3c957d43ea1ed4e786fd87e5275e58c6164736f6c63430008130033","sourceMap":"208:159:59:-:0;;;;;;;;;;;;;;;;;;;;;","linkReferences":{}},"deployedBytecode":{"object":"0x6080806040526004361015601257600080fd5b60003560e01c635d3f8a6914602657600080fd5b60203660031901126053576004356001600160a01b038116919082900360535760209160ff60981b148152f35b600080fdfea2646970667358221220a68cfeb6ce6fe5ab87c1d872ad609dc3c957d43ea1ed4e786fd87e5275e58c6164736f6c63430008130033","sourceMap":"208:159:59:-:0;;;;;;;;;;;;;;;;;;;;;;;;;;;;-1:-1:-1;;208:159:59;;;;;;-1:-1:-1;;;;;208:159:59;;;;;;;;;;540:42:1;;;;323:35:59;208:159;;;;;;","linkReferences":{}},"methodIdentifiers":{"isSystemActor(address)":"5d3f8a69"},"rawMetadata":"{\"compiler\":{\"version\":\"0.8.19+commit.7dd6d404\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"_address\",\"type\":\"address\"}],\"name\":\"isSystemActor\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"pure\",\"type\":\"function\"}],\"devdoc\":{\"author\":\"LimeChain team\",\"kind\":\"dev\",\"methods\":{},\"title\":\"Helper library for checking account type\",\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"src/lib/AccountHelper.sol\":\"AccountHelper\"},\"evmVersion\":\"paris\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[\":\\\"ds-test/=lib/forge-std/lib/ds-test/src/,forge-std/=lib/forge-std/src/,openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/,fevmate=lib/fevmate/contracts,murky/=lib/murky/src,elliptic-curve-solidity/=lib/elliptic-curve-solidity\\\"/\",\":ds-test/=lib/forge-std/lib/ds-test/src/\",\":elliptic-curve-solidity/=lib/elliptic-curve-solidity/\",\":erc4626-tests/=lib/openzeppelin-contracts/lib/erc4626-tests/\",\":fevmate/=lib/fevmate/contracts/\",\":forge-std/=lib/forge-std/src/\",\":murky/=lib/murky/src/\",\":openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/\",\":openzeppelin/=lib/openzeppelin-contracts/contracts/\"],\"viaIR\":true},\"sources\":{\"lib/fevmate/contracts/utils/FilAddress.sol\":{\"keccak256\":\"0x8707b4f152e92b852090c313419c0dc772eebf4428472a0659dd6b13dd6bee31\",\"license\":\"MIT\",\"urls\":[\"bzz-raw://442fc3cb02e610424f0599f4cc519e4fbead47da09911697b62208a2ae51e4a7\",\"dweb:/ipfs/QmRpKJ9tWWTHgMpRB18DHJLbCT4YT9yp2G89H9mHGu5ss2\"]},\"src/lib/AccountHelper.sol\":{\"keccak256\":\"0x937fc49ac09d8c4d62c9c38e312be958e276b615bbf2f7dd688457ebf222f566\",\"license\":\"MIT OR Apache-2.0\",\"urls\":[\"bzz-raw://8ce593eea7876399b4eaf0c5ccef11a25ea1f65df9e08039fe8e99aa2cafd4fc\",\"dweb:/ipfs/QmPHDDatWa18EseP9LNRRQjRyw6jb7qJSguEoy8W3nzTua\"]}},\"version\":1}","metadata":{"compiler":{"version":"0.8.19+commit.7dd6d404"},"language":"Solidity","output":{"abi":[{"inputs":[{"internalType":"address","name":"_address","type":"address"}],"stateMutability":"pure","type":"function","name":"isSystemActor","outputs":[{"internalType":"bool","name":"","type":"bool"}]}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"remappings":["\"ds-test/=lib/forge-std/lib/ds-test/src/,forge-std/=lib/forge-std/src/,openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/,fevmate=lib/fevmate/contracts,murky/=lib/murky/src,elliptic-curve-solidity/=lib/elliptic-curve-solidity\"/","ds-test/=lib/forge-std/lib/ds-test/src/","elliptic-curve-solidity/=lib/elliptic-curve-solidity/","erc4626-tests/=lib/openzeppelin-contracts/lib/erc4626-tests/","fevmate/=lib/fevmate/contracts/","forge-std/=lib/forge-std/src/","murky/=lib/murky/src/","openzeppelin-contracts/=lib/openzeppelin-contracts/contracts/","openzeppelin/=lib/openzeppelin-contracts/contracts/"],"optimizer":{"enabled":true,"runs":200},"metadata":{"bytecodeHash":"ipfs"},"compilationTarget":{"src/lib/AccountHelper.sol":"AccountHelper"},"libraries":{},"viaIR":true},"sources":{"lib/fevmate/contracts/utils/FilAddress.sol":{"keccak256":"0x8707b4f152e92b852090c313419c0dc772eebf4428472a0659dd6b13dd6bee31","urls":["bzz-raw://442fc3cb02e610424f0599f4cc519e4fbead47da09911697b62208a2ae51e4a7","dweb:/ipfs/QmRpKJ9tWWTHgMpRB18DHJLbCT4YT9yp2G89H9mHGu5ss2"],"license":"MIT"},"src/lib/AccountHelper.sol":{"keccak256":"0x937fc49ac09d8c4d62c9c38e312be958e276b615bbf2f7dd688457ebf222f566","urls":["bzz-raw://8ce593eea7876399b4eaf0c5ccef11a25ea1f65df9e08039fe8e99aa2cafd4fc","dweb:/ipfs/QmPHDDatWa18EseP9LNRRQjRyw6jb7qJSguEoy8W3nzTua"],"license":"MIT OR Apache-2.0"}},"version":1},"ast":{"absolutePath":"src/lib/AccountHelper.sol","id":40392,"exportedSymbols":{"AccountHelper":[40391],"FilAddress":[1428]},"nodeType":"SourceUnit","src":"46:322:59","nodes":[{"id":40374,"nodeType":"PragmaDirective","src":"46:23:59","nodes":[],"literals":["solidity","0.8",".19"]},{"id":40376,"nodeType":"ImportDirective","src":"71:56:59","nodes":[],"absolutePath":"lib/fevmate/contracts/utils/FilAddress.sol","file":"fevmate/utils/FilAddress.sol","nameLocation":"-1:-1:-1","scope":40392,"sourceUnit":1429,"symbolAliases":[{"foreign":{"id":40375,"name":"FilAddress","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":1428,"src":"79:10:59","typeDescriptions":{}},"nameLocation":"-1:-1:-1"}],"unitAlias":""},{"id":40391,"nodeType":"ContractDefinition","src":"208:159:59","nodes":[{"id":40390,"nodeType":"FunctionDefinition","src":"236:129:59","nodes":[],"body":{"id":40389,"nodeType":"Block","src":"306:59:59","nodes":[],"statements":[{"expression":{"commonType":{"typeIdentifier":"t_address","typeString":"address"},"id":40387,"isConstant":false,"isLValue":false,"isPure":false,"lValueRequested":false,"leftExpression":{"id":40384,"name":"_address","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":40379,"src":"323:8:59","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"BinaryOperation","operator":"==","rightExpression":{"expression":{"id":40385,"name":"FilAddress","nodeType":"Identifier","overloadedDeclarations":[],"referencedDeclaration":1428,"src":"335:10:59","typeDescriptions":{"typeIdentifier":"t_type$_t_contract$_FilAddress_$1428_$","typeString":"type(library FilAddress)"}},"id":40386,"isConstant":false,"isLValue":false,"isPure":true,"lValueRequested":false,"memberLocation":"346:12:59","memberName":"SYSTEM_ACTOR","nodeType":"MemberAccess","referencedDeclaration":1141,"src":"335:23:59","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"src":"323:35:59","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"functionReturnParameters":40383,"id":40388,"nodeType":"Return","src":"316:42:59"}]},"functionSelector":"5d3f8a69","implemented":true,"kind":"function","modifiers":[],"name":"isSystemActor","nameLocation":"245:13:59","parameters":{"id":40380,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40379,"mutability":"mutable","name":"_address","nameLocation":"267:8:59","nodeType":"VariableDeclaration","scope":40390,"src":"259:16:59","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":40378,"name":"address","nodeType":"ElementaryTypeName","src":"259:7:59","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"}],"src":"258:18:59"},"returnParameters":{"id":40383,"nodeType":"ParameterList","parameters":[{"constant":false,"id":40382,"mutability":"mutable","name":"","nameLocation":"-1:-1:-1","nodeType":"VariableDeclaration","scope":40390,"src":"300:4:59","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"},"typeName":{"id":40381,"name":"bool","nodeType":"ElementaryTypeName","src":"300:4:59","typeDescriptions":{"typeIdentifier":"t_bool","typeString":"bool"}},"visibility":"internal"}],"src":"299:6:59"},"scope":40391,"stateMutability":"pure","virtual":false,"visibility":"external"}],"abstract":false,"baseContracts":[],"canonicalName":"AccountHelper","contractDependencies":[],"contractKind":"library","documentation":{"id":40377,"nodeType":"StructuredDocumentation","src":"129:79:59","text":"@title Helper library for checking account type\n @author LimeChain team"},"fullyImplemented":true,"linearizedBaseContracts":[40391],"name":"AccountHelper","nameLocation":"216:13:59","scope":40392,"usedErrors":[]}],"license":"MIT OR Apache-2.0"},"id":59}

contracts/.out/FvmAddress.sol/FvmAddress.json

@@ -0,0 +1 @@
+{"abi":[],"bytecode":{"object":"0x","linkReferences":{}},"deployedBytecode":{"object":"0x","linkReferences":{}},"ast":{"absolutePath":"src/structs/FvmAddress.sol","id":49959,"exportedSymbols":{"DelegatedAddress":[49958],"FvmAddress":[49951]},"nodeType":"SourceUnit","src":"46:489:81","nodes":[{"id":49946,"nodeType":"PragmaDirective","src":"46:23:81","nodes":[],"literals":["solidity","0.8",".19"]},{"id":49951,"nodeType":"StructDefinition","src":"320:60:81","nodes":[],"canonicalName":"FvmAddress","members":[{"constant":false,"id":49948,"mutability":"mutable","name":"addrType","nameLocation":"350:8:81","nodeType":"VariableDeclaration","scope":49951,"src":"344:14:81","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint8","typeString":"uint8"},"typeName":{"id":49947,"name":"uint8","nodeType":"ElementaryTypeName","src":"344:5:81","typeDescriptions":{"typeIdentifier":"t_uint8","typeString":"uint8"}},"visibility":"internal"},{"constant":false,"id":49950,"mutability":"mutable","name":"payload","nameLocation":"370:7:81","nodeType":"VariableDeclaration","scope":49951,"src":"364:13:81","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"},"typeName":{"id":49949,"name":"bytes","nodeType":"ElementaryTypeName","src":"364:5:81","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"name":"FvmAddress","nameLocation":"327:10:81","scope":49959,"visibility":"public"},{"id":49958,"nodeType":"StructDefinition","src":"447:87:81","nodes":[],"canonicalName":"DelegatedAddress","members":[{"constant":false,"id":49953,"mutability":"mutable","name":"namespace","nameLocation":"484:9:81","nodeType":"VariableDeclaration","scope":49958,"src":"477:16:81","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"},"typeName":{"id":49952,"name":"uint64","nodeType":"ElementaryTypeName","src":"477:6:81","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"visibility":"internal"},{"constant":false,"id":49955,"mutability":"mutable","name":"length","nameLocation":"507:6:81","nodeType":"VariableDeclaration","scope":49958,"src":"499:14:81","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_uint128","typeString":"uint128"},"typeName":{"id":49954,"name":"uint128","nodeType":"ElementaryTypeName","src":"499:7:81","typeDescriptions":{"typeIdentifier":"t_uint128","typeString":"uint128"}},"visibility":"internal"},{"constant":false,"id":49957,"mutability":"mutable","name":"buffer","nameLocation":"525:6:81","nodeType":"VariableDeclaration","scope":49958,"src":"519:12:81","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"},"typeName":{"id":49956,"name":"bytes","nodeType":"ElementaryTypeName","src":"519:5:81","typeDescriptions":{"typeIdentifier":"t_bytes_storage_ptr","typeString":"bytes"}},"visibility":"internal"}],"name":"DelegatedAddress","nameLocation":"454:16:81","scope":49959,"visibility":"public"}],"license":"MIT OR Apache-2.0"},"id":81}

contracts/.out/LibSubnetRegistryStorage.sol/LibSubnetRegistryStorage.json

@@ -0,0 +1 @@
+{"abi":[],"bytecode":{"object":"0x","linkReferences":{}},"deployedBytecode":{"object":"0x","linkReferences":{}},"ast":{"absolutePath":"src/lib/LibSubnetRegistryStorage.sol","id":47319,"exportedSymbols":{"SubnetRegistryActorStorage":[47318]},"nodeType":"SourceUnit","src":"46:939:73","nodes":[{"id":47290,"nodeType":"PragmaDirective","src":"46:23:73","nodes":[],"literals":["solidity","0.8",".19"]},{"id":47318,"nodeType":"StructDefinition","src":"71:913:73","nodes":[],"canonicalName":"SubnetRegistryActorStorage","members":[{"constant":false,"id":47292,"mutability":"mutable","name":"GATEWAY","nameLocation":"171:7:73","nodeType":"VariableDeclaration","scope":47318,"src":"163:15:73","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":47291,"name":"address","nodeType":"ElementaryTypeName","src":"163:7:73","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":47295,"mutability":"mutable","name":"SUBNET_GETTER_FACET","nameLocation":"299:19:73","nodeType":"VariableDeclaration","scope":47318,"src":"291:27:73","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":47294,"name":"address","nodeType":"ElementaryTypeName","src":"291:7:73","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":47297,"mutability":"mutable","name":"SUBNET_MANAGER_FACET","nameLocation":"384:20:73","nodeType":"VariableDeclaration","scope":47318,"src":"376:28:73","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"},"typeName":{"id":47296,"name":"address","nodeType":"ElementaryTypeName","src":"376:7:73","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"visibility":"internal"},{"constant":false,"id":47301,"mutability":"mutable","name":"subnetGetterSelectors","nameLocation":"471:21:73","nodeType":"VariableDeclaration","scope":47318,"src":"462:30:73","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_array$_t_bytes4_$dyn_storage_ptr","typeString":"bytes4[]"},"typeName":{"baseType":{"id":47299,"name":"bytes4","nodeType":"ElementaryTypeName","src":"462:6:73","typeDescriptions":{"typeIdentifier":"t_bytes4","typeString":"bytes4"}},"id":47300,"nodeType":"ArrayTypeName","src":"462:8:73","typeDescriptions":{"typeIdentifier":"t_array$_t_bytes4_$dyn_storage_ptr","typeString":"bytes4[]"}},"visibility":"internal"},{"constant":false,"id":47305,"mutability":"mutable","name":"subnetManagerSelectors","nameLocation":"560:22:73","nodeType":"VariableDeclaration","scope":47318,"src":"551:31:73","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_array$_t_bytes4_$dyn_storage_ptr","typeString":"bytes4[]"},"typeName":{"baseType":{"id":47303,"name":"bytes4","nodeType":"ElementaryTypeName","src":"551:6:73","typeDescriptions":{"typeIdentifier":"t_bytes4","typeString":"bytes4"}},"id":47304,"nodeType":"ArrayTypeName","src":"551:8:73","typeDescriptions":{"typeIdentifier":"t_array$_t_bytes4_$dyn_storage_ptr","typeString":"bytes4[]"}},"visibility":"internal"},{"constant":false,"id":47312,"mutability":"mutable","name":"subnets","nameLocation":"809:7:73","nodeType":"VariableDeclaration","scope":47318,"src":"762:54:73","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_mapping$_t_address_$_t_mapping$_t_uint64_$_t_address_$_$","typeString":"mapping(address => mapping(uint64 => address))"},"typeName":{"id":47311,"keyName":"","keyNameLocation":"-1:-1:-1","keyType":{"id":47307,"name":"address","nodeType":"ElementaryTypeName","src":"770:7:73","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"Mapping","src":"762:46:73","typeDescriptions":{"typeIdentifier":"t_mapping$_t_address_$_t_mapping$_t_uint64_$_t_address_$_$","typeString":"mapping(address => mapping(uint64 => address))"},"valueName":"","valueNameLocation":"-1:-1:-1","valueType":{"id":47310,"keyName":"","keyNameLocation":"-1:-1:-1","keyType":{"id":47308,"name":"uint64","nodeType":"ElementaryTypeName","src":"789:6:73","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}},"nodeType":"Mapping","src":"781:26:73","typeDescriptions":{"typeIdentifier":"t_mapping$_t_uint64_$_t_address_$","typeString":"mapping(uint64 => address)"},"valueName":"","valueNameLocation":"-1:-1:-1","valueType":{"id":47309,"name":"address","nodeType":"ElementaryTypeName","src":"799:7:73","stateMutability":"nonpayable","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}}}},"visibility":"internal"},{"constant":false,"id":47317,"mutability":"mutable","name":"userNonces","nameLocation":"971:10:73","nodeType":"VariableDeclaration","scope":47318,"src":"944:37:73","stateVariable":false,"storageLocation":"default","typeDescriptions":{"typeIdentifier":"t_mapping$_t_address_$_t_uint64_$","typeString":"mapping(address => uint64)"},"typeName":{"id":47316,"keyName":"","keyNameLocation":"-1:-1:-1","keyType":{"id":47314,"name":"address","nodeType":"ElementaryTypeName","src":"952:7:73","typeDescriptions":{"typeIdentifier":"t_address","typeString":"address"}},"nodeType":"Mapping","src":"944:26:73","typeDescriptions":{"typeIdentifier":"t_mapping$_t_address_$_t_uint64_$","typeString":"mapping(address => uint64)"},"valueName":"","valueNameLocation":"-1:-1:-1","valueType":{"id":47315,"name":"uint64","nodeType":"ElementaryTypeName","src":"963:6:73","typeDescriptions":{"typeIdentifier":"t_uint64","typeString":"uint64"}}},"visibility":"internal"}],"name":"SubnetRegistryActorStorage","nameLocation":"78:26:73","scope":47319,"visibility":"public"}],"license":"MIT OR Apache-2.0"},"id":73}