Skip to content

Commit

Permalink
added Arb & Linea OAPPS, OFTs and NFTs - all wiring up and working co…
Browse files Browse the repository at this point in the history
…rrectly :-)
  • Loading branch information
adamocallaghan committed Sep 5, 2024
1 parent 3db11dc commit 1d1fc8c
Show file tree
Hide file tree
Showing 30 changed files with 12,977 additions and 737 deletions.
16 changes: 15 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,22 @@ deploy-contracts--to-base-and-set-addresses-for-collateral-and-stablecoin:
deploy-contracts--to-optimism-and-set-addresses-for-collateral-and-stablecoin:
forge script script/DeployToOptimism.s.sol:DeployToOptimism --broadcast --verify --etherscan-api-key $(OPTIMISM_ETHERSCAN_API_KEY) --rpc-url $(OPTIMISM_SEPOLIA_RPC) --account deployer -vvvvv

deploy-contracts--to-arbitrum-and-set-addresses-for-collateral-and-stablecoin:
forge script script/DeployToArbitrum.s.sol:DeployToArbitrum --broadcast --verify --etherscan-api-key $(ARBITRUM_ETHERSCAN_API_KEY) --rpc-url $(ARBITRUM_SEPOLIA_RPC) --account deployer -vvvvv

# ETHERSCAN API THROWING ERROR
deploy-contracts--to-linea-and-set-addresses-for-collateral-and-stablecoin:
forge script script/DeployToLinea.s.sol:DeployToLinea --broadcast --rpc-url $(LINEA_SEPOLIA_RPC) --account deployer -vvvvv

# GAS COSTS OFF THE WALL!
# deploy-contracts--to-ethereum-and-set-addresses-for-collateral-and-stablecoin:
# forge script script/DeployToEthereum.s.sol:DeployToEthereum --broadcast --verify --etherscan-api-key $(ETHEREUM_ETHERSCAN_API_KEY) --rpc-url $(ETHEREUM_SEPOLIA_RPC) --account deployer -vvvvv

# deploy-contracts--to-zksync-and-set-addresses-for-collateral-and-stablecoin:
# forge script script/DeployToZkSync.s.sol:DeployToZkSync --broadcast --verify --etherscan-api-key $(ZKSYNC_ETHERSCAN_API_KEY) --rpc-url $(ZKSYNC_SEPOLIA_RPC) --account deployer -vvvvv

set-peer-on-both-using-script:
forge script script/SetPeers.s.sol:SetPeers --broadcast --account deployer -vvvvv
forge script script/SetPeers.s.sol:SetPeers --broadcast --account deployer -vvvvv --via-ir



Expand Down
810 changes: 810 additions & 0 deletions broadcast/DeployToArbitrum.s.sol/421614/run-1725536095.json

Large diffs are not rendered by default.

810 changes: 810 additions & 0 deletions broadcast/DeployToArbitrum.s.sol/421614/run-latest.json

Large diffs are not rendered by default.

870 changes: 870 additions & 0 deletions broadcast/DeployToBase.s.sol/84532/run-1725482902.json

Large diffs are not rendered by default.

870 changes: 870 additions & 0 deletions broadcast/DeployToBase.s.sol/84532/run-1725486939.json

Large diffs are not rendered by default.

870 changes: 870 additions & 0 deletions broadcast/DeployToBase.s.sol/84532/run-1725535845.json

Large diffs are not rendered by default.

654 changes: 327 additions & 327 deletions broadcast/DeployToBase.s.sol/84532/run-latest.json

Large diffs are not rendered by default.

313 changes: 313 additions & 0 deletions broadcast/DeployToEthereum.s.sol/11155111/run-1725536437.json

Large diffs are not rendered by default.

313 changes: 313 additions & 0 deletions broadcast/DeployToEthereum.s.sol/11155111/run-latest.json

Large diffs are not rendered by default.

311 changes: 311 additions & 0 deletions broadcast/DeployToLinea.s.sol/59141/run-1725536136.json

Large diffs are not rendered by default.

780 changes: 780 additions & 0 deletions broadcast/DeployToLinea.s.sol/59141/run-1725536400.json

Large diffs are not rendered by default.

780 changes: 780 additions & 0 deletions broadcast/DeployToLinea.s.sol/59141/run-latest.json

Large diffs are not rendered by default.

870 changes: 870 additions & 0 deletions broadcast/DeployToOptimism.s.sol/11155420/run-1725483003.json

Large diffs are not rendered by default.

870 changes: 870 additions & 0 deletions broadcast/DeployToOptimism.s.sol/11155420/run-1725487132.json

Large diffs are not rendered by default.

870 changes: 870 additions & 0 deletions broadcast/DeployToOptimism.s.sol/11155420/run-1725535987.json

Large diffs are not rendered by default.

632 changes: 316 additions & 316 deletions broadcast/DeployToOptimism.s.sol/11155420/run-latest.json

Large diffs are not rendered by default.

145 changes: 145 additions & 0 deletions broadcast/multi/SetPeers.s.sol-1725483133/run.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
{
"deployments": [
{
"transactions": [
{
"hash": "0xe919b0ce3e51f0c1f9510204553b19d1259c013a79bc99f59929da7b1b27fe41",
"transactionType": "CALL",
"contractName": null,
"contractAddress": "0x9c8f6c71322ab8e8001b7863448950281457a690",
"function": "setPeer(uint32,bytes32)",
"arguments": [
"40232",
"0x0000000000000000000000009c8f6c71322ab8e8001b7863448950281457a690"
],
"transaction": {
"from": "0x64a822f980dc5f126215d75d11dd8114ed0bdb5f",
"to": "0x9c8f6c71322ab8e8001b7863448950281457a690",
"gas": "0x1105c",
"value": "0x0",
"input": "0x3400288b0000000000000000000000000000000000000000000000000000000000009d280000000000000000000000009c8f6c71322ab8e8001b7863448950281457a690",
"nonce": "0x1b0",
"chainId": "0x14a34"
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [
{
"status": "0x1",
"cumulativeGasUsed": "0x145f79",
"logs": [
{
"address": "0x9c8f6c71322ab8e8001b7863448950281457a690",
"topics": [
"0x238399d427b947898edb290f5ff0f9109849b1c3ba196a42e35f00c50a54b98b"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000009d280000000000000000000000009c8f6c71322ab8e8001b7863448950281457a690",
"blockHash": "0x76a8d7eb764ca7f52336fc73a955620c07d2b4b9473c6bbf7a1627f392414e7e",
"blockNumber": "0xe2b4c9",
"transactionHash": "0xe919b0ce3e51f0c1f9510204553b19d1259c013a79bc99f59929da7b1b27fe41",
"transactionIndex": "0x8",
"logIndex": "0x17",
"removed": false
}
],
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"transactionHash": "0xe919b0ce3e51f0c1f9510204553b19d1259c013a79bc99f59929da7b1b27fe41",
"transactionIndex": "0x8",
"blockHash": "0x76a8d7eb764ca7f52336fc73a955620c07d2b4b9473c6bbf7a1627f392414e7e",
"blockNumber": "0xe2b4c9",
"gasUsed": "0xba3b",
"effectiveGasPrice": "0xf435b",
"from": "0x64a822f980dc5f126215d75d11dd8114ed0bdb5f",
"to": "0x9c8f6c71322ab8e8001b7863448950281457a690",
"contractAddress": null,
"l1BaseFeeScalar": "0x44d",
"l1BlobBaseFee": "0xf0a79d117",
"l1BlobBaseFeeScalar": "0xa118b",
"l1Fee": "0x3e2d2dc88fd",
"l1GasPrice": "0x15511bd6a",
"l1GasUsed": "0x640"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1725483115,
"chain": 84532,
"commit": "3db11dc"
},
{
"transactions": [
{
"hash": "0xa48f001290bd3d766f1b943ab03546af08253fccd7ff58f93b6e021c26a9f480",
"transactionType": "CALL",
"contractName": null,
"contractAddress": "0x9c8f6c71322ab8e8001b7863448950281457a690",
"function": "setPeer(uint32,bytes32)",
"arguments": [
"40245",
"0x0000000000000000000000009c8f6c71322ab8e8001b7863448950281457a690"
],
"transaction": {
"from": "0x64a822f980dc5f126215d75d11dd8114ed0bdb5f",
"to": "0x9c8f6c71322ab8e8001b7863448950281457a690",
"gas": "0x1105c",
"value": "0x0",
"input": "0x3400288b0000000000000000000000000000000000000000000000000000000000009d350000000000000000000000009c8f6c71322ab8e8001b7863448950281457a690",
"nonce": "0xf1",
"chainId": "0xaa37dc"
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [
{
"status": "0x1",
"cumulativeGasUsed": "0x2ee23",
"logs": [
{
"address": "0x9c8f6c71322ab8e8001b7863448950281457a690",
"topics": [
"0x238399d427b947898edb290f5ff0f9109849b1c3ba196a42e35f00c50a54b98b"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000009d350000000000000000000000009c8f6c71322ab8e8001b7863448950281457a690",
"blockHash": "0xfc224304855d01750f7824b05349543d8b3c156875b690e92ae8dd67412bca1c",
"blockNumber": "0x100f667",
"transactionHash": "0xa48f001290bd3d766f1b943ab03546af08253fccd7ff58f93b6e021c26a9f480",
"transactionIndex": "0x2",
"logIndex": "0x2",
"removed": false
}
],
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000100020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"transactionHash": "0xa48f001290bd3d766f1b943ab03546af08253fccd7ff58f93b6e021c26a9f480",
"transactionIndex": "0x2",
"blockHash": "0xfc224304855d01750f7824b05349543d8b3c156875b690e92ae8dd67412bca1c",
"blockNumber": "0x100f667",
"gasUsed": "0xba3b",
"effectiveGasPrice": "0xf6a67",
"from": "0x64a822f980dc5f126215d75d11dd8114ed0bdb5f",
"to": "0x9c8f6c71322ab8e8001b7863448950281457a690",
"contractAddress": null,
"l1BaseFeeScalar": "0x1db0",
"l1BlobBaseFee": "0x11993d0609",
"l1BlobBaseFeeScalar": "0xd2730",
"l1Fee": "0x6026a5308a8",
"l1GasPrice": "0x1c2e2e009",
"l1GasUsed": "0x640"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1725483116,
"chain": 11155420,
"commit": "3db11dc"
}
],
"timestamp": 1725483133
}
145 changes: 145 additions & 0 deletions broadcast/multi/SetPeers.s.sol-1725487224/run.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
{
"deployments": [
{
"transactions": [
{
"hash": "0x038803d87c2aecf8209a439eea3268a0820dedb90ef6d5a768b9252bef745565",
"transactionType": "CALL",
"contractName": null,
"contractAddress": "0x75057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"function": "setPeer(uint32,bytes32)",
"arguments": [
"40232",
"0x00000000000000000000000075057e6fbf35dfa697809fb34b5f3dfc8c1d6745"
],
"transaction": {
"from": "0x64a822f980dc5f126215d75d11dd8114ed0bdb5f",
"to": "0x75057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"gas": "0x1014c",
"value": "0x0",
"input": "0x3400288b0000000000000000000000000000000000000000000000000000000000009d2800000000000000000000000075057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"nonce": "0x1c3",
"chainId": "0x14a34"
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [
{
"status": "0x1",
"cumulativeGasUsed": "0xdba75",
"logs": [
{
"address": "0x75057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"topics": [
"0x238399d427b947898edb290f5ff0f9109849b1c3ba196a42e35f00c50a54b98b"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000009d2800000000000000000000000075057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"blockHash": "0xcb2cc5ff125200fc9dcb187720acd52e2323ec9a54677afa1c3081482a971880",
"blockNumber": "0xe2bcc6",
"transactionHash": "0x038803d87c2aecf8209a439eea3268a0820dedb90ef6d5a768b9252bef745565",
"transactionIndex": "0x9",
"logIndex": "0xc",
"removed": false
}
],
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"transactionHash": "0x038803d87c2aecf8209a439eea3268a0820dedb90ef6d5a768b9252bef745565",
"transactionIndex": "0x9",
"blockHash": "0xcb2cc5ff125200fc9dcb187720acd52e2323ec9a54677afa1c3081482a971880",
"blockNumber": "0xe2bcc6",
"gasUsed": "0xba48",
"effectiveGasPrice": "0xc743",
"from": "0x64a822f980dc5f126215d75d11dd8114ed0bdb5f",
"to": "0x75057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"contractAddress": null,
"l1BaseFeeScalar": "0x44d",
"l1BlobBaseFee": "0xb6d3844c0",
"l1BlobBaseFeeScalar": "0xa118b",
"l1Fee": "0x2f4217f99d8",
"l1GasPrice": "0x137689d59",
"l1GasUsed": "0x640"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1725487205,
"chain": 84532,
"commit": "3db11dc"
},
{
"transactions": [
{
"hash": "0xb43d69590cd51565624bab77600b2e91877fb510a080375ced20b7591ca7a775",
"transactionType": "CALL",
"contractName": null,
"contractAddress": "0x75057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"function": "setPeer(uint32,bytes32)",
"arguments": [
"40245",
"0x00000000000000000000000075057e6fbf35dfa697809fb34b5f3dfc8c1d6745"
],
"transaction": {
"from": "0x64a822f980dc5f126215d75d11dd8114ed0bdb5f",
"to": "0x75057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"gas": "0x1014c",
"value": "0x0",
"input": "0x3400288b0000000000000000000000000000000000000000000000000000000000009d3500000000000000000000000075057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"nonce": "0x101",
"chainId": "0xaa37dc"
},
"additionalContracts": [],
"isFixedGasLimit": false
}
],
"receipts": [
{
"status": "0x1",
"cumulativeGasUsed": "0x165b7",
"logs": [
{
"address": "0x75057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"topics": [
"0x238399d427b947898edb290f5ff0f9109849b1c3ba196a42e35f00c50a54b98b"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000009d3500000000000000000000000075057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"blockHash": "0x69d25fbdafb0b23774e7862a73de1555bd33bf69a17a502971e2ac20abe75599",
"blockNumber": "0x100fe65",
"transactionHash": "0xb43d69590cd51565624bab77600b2e91877fb510a080375ced20b7591ca7a775",
"transactionIndex": "0x1",
"logIndex": "0x0",
"removed": false
}
],
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000000000000000",
"type": "0x2",
"transactionHash": "0xb43d69590cd51565624bab77600b2e91877fb510a080375ced20b7591ca7a775",
"transactionIndex": "0x1",
"blockHash": "0x69d25fbdafb0b23774e7862a73de1555bd33bf69a17a502971e2ac20abe75599",
"blockNumber": "0x100fe65",
"gasUsed": "0xba48",
"effectiveGasPrice": "0x30e044d",
"from": "0x64a822f980dc5f126215d75d11dd8114ed0bdb5f",
"to": "0x75057e6fbf35dfa697809fb34b5f3dfc8c1d6745",
"contractAddress": null,
"l1BaseFeeScalar": "0x1db0",
"l1BlobBaseFee": "0xde7b1c5a8",
"l1BlobBaseFeeScalar": "0xd2730",
"l1Fee": "0x4c06ca3166f",
"l1GasPrice": "0x176ea7b39",
"l1GasUsed": "0x640"
}
],
"libraries": [],
"pending": [],
"returns": {},
"timestamp": 1725487205,
"chain": 11155420,
"commit": "3db11dc"
}
],
"timestamp": 1725487224
}
Loading

0 comments on commit 1d1fc8c

Please sign in to comment.