Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OKX X1 #115

Merged
merged 12 commits into from
Feb 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,6 @@ contracts/foundry/out/
.env


secrets.json
secrets.json

yarn.lock
2 changes: 1 addition & 1 deletion contracts/dependencies.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"59140": "0xf56dc6695cF1f5c364eDEbC7Dc7077ac9B586068",
"42161": "0xaf88d065e77c8cC2239327C5EDb3A432268e5831",
"421613": "0xfd064A18f3BF249cf1f87FC203E90D8f650f2d63",
"65":"0xf8616348fB444479BC84F65F61c410843407860D"
"195":"0x7C3bE0fa5a20ad361685932a50be9dEC6F302db6"
}
}
42 changes: 21 additions & 21 deletions contracts/deployments.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"65": [
"195": [
{
"name": "OKTC",
"chainId": "65",
"name": "OKX_X1_testnet",
"chainId": "195",
"contracts": {
"APRHistory": {
"address": "0xd99343a49C1b5b9d6690AEa5dB3Ae0da3A9cC4c4",
"address": "0x633Fff91613e32a91bDBd0Ef30067aA3B86CBcd7",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -101,7 +101,7 @@
]
},
"GlobalBlacklist": {
"address": "0x8a0D0714c45B9ba78AEad7601390748F6f8f5452",
"address": "0xc44395eC149C6743A268A901a38e5b02dc87D10C",
"abi": [
{
"anonymous": false,
Expand Down Expand Up @@ -355,7 +355,7 @@
]
},
"GlobalBlacklist_Implementation": {
"address": "0x9E3E4FF5738712cFF86b18182F90edf1c668156b",
"address": "0xfD2a2358d1AceFABA5581771F50312244910f3bd",
"abi": [
{
"inputs": [],
Expand Down Expand Up @@ -590,7 +590,7 @@
]
},
"GlobalBlacklist_Proxy": {
"address": "0x8a0D0714c45B9ba78AEad7601390748F6f8f5452",
"address": "0xc44395eC149C6743A268A901a38e5b02dc87D10C",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -664,7 +664,7 @@
]
},
"GlobalOwner": {
"address": "0x2646E026CCF356850eC54E9a522B30b3db679D71",
"address": "0x2547A36186eCC16C25649B9234D4937216e45978",
"abi": [
{
"anonymous": false,
Expand Down Expand Up @@ -893,7 +893,7 @@
]
},
"GlobalOwner_Implementation": {
"address": "0x1B8DB32e8ed2A2a25d4462F446eCCe5405bd1C93",
"address": "0x1cfEFbaA55Ad0F9078159cc0F8e6e118D4bc9B97",
"abi": [
{
"inputs": [],
Expand Down Expand Up @@ -1103,7 +1103,7 @@
]
},
"GlobalOwner_Proxy": {
"address": "0x2646E026CCF356850eC54E9a522B30b3db679D71",
"address": "0x2547A36186eCC16C25649B9234D4937216e45978",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -1177,7 +1177,7 @@
]
},
"GlobalPause": {
"address": "0x74774f077c9f60c0cb7e68534C4749f94ef06a3c",
"address": "0x696C4B4f35Ee60e110cDaE5b3eBd78a5597f6Ac6",
"abi": [
{
"anonymous": false,
Expand Down Expand Up @@ -1439,7 +1439,7 @@
]
},
"GlobalPause_Implementation": {
"address": "0xef76f5d0315f5F952cfFFa5376962aDb35c6eEba",
"address": "0x38A43930fe7258C161806e2064d2eF7562C562b8",
"abi": [
{
"inputs": [],
Expand Down Expand Up @@ -1682,7 +1682,7 @@
]
},
"GlobalPause_Proxy": {
"address": "0x74774f077c9f60c0cb7e68534C4749f94ef06a3c",
"address": "0x696C4B4f35Ee60e110cDaE5b3eBd78a5597f6Ac6",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -1756,7 +1756,7 @@
]
},
"LDYStaking": {
"address": "0xdc2051273BdEb81739E3dfa67B7df7D7A8e98901",
"address": "0x045f9E9d2225319dF5E0909007FE7979E2674a32",
"abi": [
{
"anonymous": false,
Expand Down Expand Up @@ -1908,7 +1908,7 @@
]
},
"LTokenSignaler": {
"address": "0x257E5913605a21561e552171AED2D8C3fa7335aB",
"address": "0x6A88b87aA4865e8d67D7CD32178bA03F885a088a",
"abi": [
{
"anonymous": false,
Expand Down Expand Up @@ -2143,7 +2143,7 @@
]
},
"LTokenSignaler_Implementation": {
"address": "0x62825D3DC53AC21c68f8Da4E98d229FdADaFc9e4",
"address": "0xECBAb0dEaf59Bd9e2725678df0b3cbC82bc8d364",
"abi": [
{
"inputs": [],
Expand Down Expand Up @@ -2359,7 +2359,7 @@
]
},
"LTokenSignaler_Proxy": {
"address": "0x257E5913605a21561e552171AED2D8C3fa7335aB",
"address": "0x6A88b87aA4865e8d67D7CD32178bA03F885a088a",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -2433,7 +2433,7 @@
]
},
"LUSDC": {
"address": "0xecbC53e4379ABC34Da28E33Da8aEeC54570d2cD1",
"address": "0x1e1B0bB6C182eFD7d64cdAbbF3A3E315dE26E259",
"abi": [
{
"anonymous": false,
Expand Down Expand Up @@ -3761,7 +3761,7 @@
]
},
"LUSDC_Implementation": {
"address": "0x2D5B0d8FCFf3634791E235054a93078D15F4FC52",
"address": "0x9466891d9E77eAD21D8445350c51ecD35fd170bF",
"abi": [
{
"anonymous": false,
Expand Down Expand Up @@ -5065,7 +5065,7 @@
]
},
"LUSDC_Proxy": {
"address": "0xecbC53e4379ABC34Da28E33Da8aEeC54570d2cD1",
"address": "0x1e1B0bB6C182eFD7d64cdAbbF3A3E315dE26E259",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -5139,7 +5139,7 @@
]
},
"PreMining": {
"address": "0xbB7acA39EDFCdeBcecb738b77251C17e78318AbE",
"address": "0x2Bb79F621518BbA45dA5Ec57BC885C4686A60De9",
"abi": [
{
"inputs": [
Expand Down
1 change: 0 additions & 1 deletion contracts/hardhat/deployments/OKTC/.chainId

This file was deleted.

1 change: 1 addition & 0 deletions contracts/hardhat/deployments/OKX_X1_testnet/.chainId
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
195
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0xd99343a49C1b5b9d6690AEa5dB3Ae0da3A9cC4c4",
"address": "0x633Fff91613e32a91bDBd0Ef30067aA3B86CBcd7",
"abi": [
{
"inputs": [
Expand Down Expand Up @@ -93,18 +93,18 @@
"type": "function"
}
],
"transactionHash": "0x0cb7c46ad8834f2107b83c8926d199b2ffe87bfa0216aff1d5d56e79f6b580d9",
"transactionHash": "0xe80caab74b29a90684e55e46401f46d4a9e2b4bc1e21ff63d8f822c7bcf11a18",
"receipt": {
"to": null,
"from": "0xE828d04fd7b0ad97000d44f1122D08cefc49f5b0",
"contractAddress": "0xd99343a49C1b5b9d6690AEa5dB3Ae0da3A9cC4c4",
"from": "0xB8A2b9DA0b39b9D41907F2Db44cfD0d67d7237c4",
"contractAddress": "0x633Fff91613e32a91bDBd0Ef30067aA3B86CBcd7",
"transactionIndex": 0,
"gasUsed": "745589",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"blockHash": "0xb629ad9fdbef9cf2ec186a91445cb6b83e2bf254285b2a65f520e534529bc2ed",
"transactionHash": "0x0cb7c46ad8834f2107b83c8926d199b2ffe87bfa0216aff1d5d56e79f6b580d9",
"blockHash": "0xb641ea3ebd7272fee93920eda8817d6af8d63167fd09cbdcf9e46707e52b7301",
"transactionHash": "0xe80caab74b29a90684e55e46401f46d4a9e2b4bc1e21ff63d8f822c7bcf11a18",
"logs": [],
"blockNumber": 27819968,
"blockNumber": 10172235,
"cumulativeGasUsed": "745589",
"status": 1,
"byzantium": true
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0x8a0D0714c45B9ba78AEad7601390748F6f8f5452",
"address": "0xc44395eC149C6743A268A901a38e5b02dc87D10C",
"abi": [
{
"anonymous": false,
Expand Down Expand Up @@ -251,51 +251,51 @@
"type": "constructor"
}
],
"transactionHash": "0xdf0eea29de13ef7a75ec89387bc2e7ef473c69756d91a17860404fc44da473c4",
"transactionHash": "0x57faaff42f061c8fed3700df9aed8538f4817930cdbb0879e0e112d4810e03a3",
"receipt": {
"to": null,
"from": "0xE828d04fd7b0ad97000d44f1122D08cefc49f5b0",
"contractAddress": "0x8a0D0714c45B9ba78AEad7601390748F6f8f5452",
"from": "0xB8A2b9DA0b39b9D41907F2Db44cfD0d67d7237c4",
"contractAddress": "0xc44395eC149C6743A268A901a38e5b02dc87D10C",
"transactionIndex": 0,
"gasUsed": "334149",
"logsBloom": "0x00000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000020000080000000000000000000000000000000000000000000000400200000000000000000000000000040000000000020000000000000000000040000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"blockHash": "0x985509513b602669f631aa273bcc25b15ebf650e56788754c70f193a11782e8c",
"transactionHash": "0xdf0eea29de13ef7a75ec89387bc2e7ef473c69756d91a17860404fc44da473c4",
"gasUsed": "332449",
"logsBloom": "0x00000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000020000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000800000000000000000000000000000000000000000080000000000000000008000000000000000000000000000400000000000000000000000000000000000010000020000000000000000000040000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000",
"blockHash": "0x478d143f57d1764b85aa10fc95fae3adbb21ca34a6eac823c87cdc5f24455b88",
"transactionHash": "0x57faaff42f061c8fed3700df9aed8538f4817930cdbb0879e0e112d4810e03a3",
"logs": [
{
"transactionIndex": 0,
"blockNumber": 27819964,
"transactionHash": "0xdf0eea29de13ef7a75ec89387bc2e7ef473c69756d91a17860404fc44da473c4",
"address": "0x8a0D0714c45B9ba78AEad7601390748F6f8f5452",
"blockNumber": 10172227,
"transactionHash": "0x57faaff42f061c8fed3700df9aed8538f4817930cdbb0879e0e112d4810e03a3",
"address": "0xc44395eC149C6743A268A901a38e5b02dc87D10C",
"topics": [
"0xbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b",
"0x0000000000000000000000009e3e4ff5738712cff86b18182f90edf1c668156b"
"0x000000000000000000000000fd2a2358d1acefaba5581771f50312244910f3bd"
],
"data": "0x",
"logIndex": 0,
"blockHash": "0x985509513b602669f631aa273bcc25b15ebf650e56788754c70f193a11782e8c"
"blockHash": "0x478d143f57d1764b85aa10fc95fae3adbb21ca34a6eac823c87cdc5f24455b88"
},
{
"transactionIndex": 0,
"blockNumber": 27819964,
"transactionHash": "0xdf0eea29de13ef7a75ec89387bc2e7ef473c69756d91a17860404fc44da473c4",
"address": "0x8a0D0714c45B9ba78AEad7601390748F6f8f5452",
"blockNumber": 10172227,
"transactionHash": "0x57faaff42f061c8fed3700df9aed8538f4817930cdbb0879e0e112d4810e03a3",
"address": "0xc44395eC149C6743A268A901a38e5b02dc87D10C",
"topics": [
"0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
],
"data": "0x0000000000000000000000000000000000000000000000000000000000000001",
"logIndex": 1,
"blockHash": "0x985509513b602669f631aa273bcc25b15ebf650e56788754c70f193a11782e8c"
"blockHash": "0x478d143f57d1764b85aa10fc95fae3adbb21ca34a6eac823c87cdc5f24455b88"
}
],
"blockNumber": 27819964,
"cumulativeGasUsed": "334149",
"blockNumber": 10172227,
"cumulativeGasUsed": "332449",
"status": 1,
"byzantium": true
},
"args": [
"0x9E3E4FF5738712cFF86b18182F90edf1c668156b",
"0xc4d66de80000000000000000000000002646e026ccf356850ec54e9a522b30b3db679d71"
"0xfD2a2358d1AceFABA5581771F50312244910f3bd",
"0xc4d66de80000000000000000000000002547a36186ecc16c25649b9234d4937216e45978"
],
"numDeployments": 1,
"solcInputHash": "0e89febeebc7444140de8e67c9067d2c",
Expand All @@ -305,10 +305,10 @@
"execute": {
"methodName": "initialize",
"args": [
"0x2646E026CCF356850eC54E9a522B30b3db679D71"
"0x2547A36186eCC16C25649B9234D4937216e45978"
]
},
"implementation": "0x9E3E4FF5738712cFF86b18182F90edf1c668156b",
"implementation": "0xfD2a2358d1AceFABA5581771F50312244910f3bd",
"devdoc": {
"details": "This contract implements an upgradeable proxy. It is upgradeable because calls are delegated to an implementation address that can be changed. This address is stored in storage in the location specified by https://eips.ethereum.org/EIPS/eip-1967[EIP1967], so that it doesn't conflict with the storage layout of the implementation behind the proxy.",
"kind": "dev",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"address": "0x9E3E4FF5738712cFF86b18182F90edf1c668156b",
"address": "0xfD2a2358d1AceFABA5581771F50312244910f3bd",
"abi": [
{
"inputs": [],
Expand Down Expand Up @@ -232,32 +232,32 @@
"type": "function"
}
],
"transactionHash": "0x2e8a197bc5e59b72f492a8ec9bc632454da76f9b2c117d93e9ff55a9d8b56916",
"transactionHash": "0xf56b7f469704513ef07a2265449f98e983e6f44bc1654147a96a8f719d2751d3",
"receipt": {
"to": null,
"from": "0xE828d04fd7b0ad97000d44f1122D08cefc49f5b0",
"contractAddress": "0x9E3E4FF5738712cFF86b18182F90edf1c668156b",
"from": "0xB8A2b9DA0b39b9D41907F2Db44cfD0d67d7237c4",
"contractAddress": "0xfD2a2358d1AceFABA5581771F50312244910f3bd",
"transactionIndex": 0,
"gasUsed": "914340",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000002000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000040000000004000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000",
"blockHash": "0x94ec6867aefb0ff6cbc2cd0091352b081e8d03478414e5e483e1a4af8e2d1462",
"transactionHash": "0x2e8a197bc5e59b72f492a8ec9bc632454da76f9b2c117d93e9ff55a9d8b56916",
"gasUsed": "914240",
"logsBloom": "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001080000000000000000000000000000000000000000000000400100000000000000000000000000000000000000000000000000000000008040000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"blockHash": "0xd80613518899ff7e4efaff1e9e97b9f1a8fc1d5c1885aa68113f26b92ef67504",
"transactionHash": "0xf56b7f469704513ef07a2265449f98e983e6f44bc1654147a96a8f719d2751d3",
"logs": [
{
"transactionIndex": 0,
"blockNumber": 27819961,
"transactionHash": "0x2e8a197bc5e59b72f492a8ec9bc632454da76f9b2c117d93e9ff55a9d8b56916",
"address": "0x9E3E4FF5738712cFF86b18182F90edf1c668156b",
"blockNumber": 10172215,
"transactionHash": "0xf56b7f469704513ef07a2265449f98e983e6f44bc1654147a96a8f719d2751d3",
"address": "0xfD2a2358d1AceFABA5581771F50312244910f3bd",
"topics": [
"0x7f26b83ff96e1f2b6a682f133852f6798a09c465da95921460cefb3847402498"
],
"data": "0x00000000000000000000000000000000000000000000000000000000000000ff",
"logIndex": 0,
"blockHash": "0x94ec6867aefb0ff6cbc2cd0091352b081e8d03478414e5e483e1a4af8e2d1462"
"blockHash": "0xd80613518899ff7e4efaff1e9e97b9f1a8fc1d5c1885aa68113f26b92ef67504"
}
],
"blockNumber": 27819961,
"cumulativeGasUsed": "914340",
"blockNumber": 10172215,
"cumulativeGasUsed": "914240",
"status": 1,
"byzantium": true
},
Expand Down
Loading