Skip to content

Commit

Permalink
fix conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
hujw77 committed Sep 12, 2024
2 parents 29eaaae + 57f0fc8 commit 7b4cd19
Show file tree
Hide file tree
Showing 5 changed files with 375 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,245 @@
{
"_format": "sphinx-sol-execution-artifact-1",
"transactions": [
{
"receipt": {
"blockHash": "0x308c469280da254dab7f1db5cbe81d19d7e649fa10a1e392192c8c2cf0624188",
"blockNumber": 61517649,
"contractAddress": null,
"cumulativeGasUsed": "19367201",
"from": "0xD70A2e6eACbdeDA77a5d4bBAE3bC70239A0e088f",
"gasPrice": "27792857114",
"gasUsed": "191343",
"hash": "0xe2d788170a5bdfdd4dd5f1da837ad9803966d0aa4ae398c8c59b94eddfa16197",
"index": 94,
"logs": [
{
"address": "0x7e16116661CA8d66C73612382833153911Fa03B1",
"blockHash": "0x308c469280da254dab7f1db5cbe81d19d7e649fa10a1e392192c8c2cf0624188",
"blockNumber": 61517649,
"data": "0x0000000000000000000000000000000000000000000000000000000000000000",
"index": 633,
"topics": [
"0x572f161235911da04685a68c06adf558fc7e4a36909dca394650e0adc19cc93d",
"0x000000000000000000000000d70a2e6eacbdeda77a5d4bbae3bc70239a0e088f",
"0x0000000000000000000000006dd645a2cc61713bf1cbb369652e0a36c3996fb2",
"0x9b9855fe76846c5481b387a7d05885824ed3c61aa65c6b15f3520de44087e587"
],
"transactionHash": "0xe2d788170a5bdfdd4dd5f1da837ad9803966d0aa4ae398c8c59b94eddfa16197",
"transactionIndex": 94
},
{
"address": "0x6dD645A2cC61713Bf1CBB369652e0a36c3996Fb2",
"blockHash": "0x308c469280da254dab7f1db5cbe81d19d7e649fa10a1e392192c8c2cf0624188",
"blockNumber": 61517649,
"data": "0x0000000000000000000000007e16116661ca8d66c73612382833153911fa03b1000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000",
"index": 634,
"topics": [
"0x382c7aec02462c9b086aba9a7f8dbb1fb8bf336e7b624b0149eeca6726d0fb4a",
"0x7f10aef094c1eb4be68050ef1ec881cee6dd76c00fbcbfec2fa0d092a095f8ce",
"0x0000000000000000000000000000000000000000000000000000000000000009"
],
"transactionHash": "0xe2d788170a5bdfdd4dd5f1da837ad9803966d0aa4ae398c8c59b94eddfa16197",
"transactionIndex": 94
},
{
"address": "0x0000000000000000000000000000000000001010",
"blockHash": "0x308c469280da254dab7f1db5cbe81d19d7e649fa10a1e392192c8c2cf0624188",
"blockNumber": 61517649,
"data": "0x0000000000000000000000000000000000000000000000000012e4aa102ea58f00000000000000000000000000000000000000000000000194e5f503be9f84be0000000000000000000000000000000000000000000001c2b100a0b6a45a647f00000000000000000000000000000000000000000000000194d31059ae70df2f0000000000000000000000000000000000000000000001c2b1138560b4890a0e",
"index": 635,
"topics": [
"0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
"0x0000000000000000000000000000000000000000000000000000000000001010",
"0x000000000000000000000000d70a2e6eacbdeda77a5d4bbae3bc70239a0e088f",
"0x00000000000000000000000002f70172f7f490653665c9bfac0666147c8af1f5"
],
"transactionHash": "0xe2d788170a5bdfdd4dd5f1da837ad9803966d0aa4ae398c8c59b94eddfa16197",
"transactionIndex": 94
}
],
"logsBloom": "0x00400000000000000000000000000000000000000000000000000000000000000000000000000000000000000048000000108000000000100000000000200000004000000002000000000000000000800000000000000000000110108000000000000000000000002000000000000400000000000000000080000000000100000000000100000000000100000000000000001000000000000000000000000000204000000000000000000000000000000000000000000400000000001002004000000001200000000001000000000002000000000000000000100000000000000000002000080000000000000000000000000001000020000000000000900000",
"status": 1,
"to": "0x7e16116661CA8d66C73612382833153911Fa03B1"
},
"response": {
"accessList": [],
"blockNumber": 61517649,
"blockHash": "0x308c469280da254dab7f1db5cbe81d19d7e649fa10a1e392192c8c2cf0624188",
"chainId": "137",
"data": "0xbe6002c20000000000000000000000006dd645a2cc61713bf1cbb369652e0a36c3996fb2000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000003848f38f8357f10aef094c1eb4be68050ef1ec881cee6dd76c00fbcbfec2fa0d092a095f8ce00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000280000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001e000000000000000000000000000000000000000000000000000000000000000890000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000100000000000000000000000000d0a0899c5dc2feb253d57ab0b7c6d1b1fcbbf8240000000000000000000000006dd645a2cc61713bf1cbb369652e0a36c3996fb2000000000000000000000000000000000000000000000000000000000000000900000000000000000000000000000000000000000000000000000000000000020000000000000000000000007e16116661ca8d66c73612382833153911fa03b100000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001521fecf36ea76df948ea3e6d4eb7149a8b79881aeb4206197d687300a0e81d2100000000000000000000000000000000000000000000000000000000000000c3e2f9385a95e551d05a22b71847d033d4d2cbbb20ece5c391f3bbcb4d794626dc2102949f1725fd77a0245149a8cf00ce4d6195014c0e70a9fb9703f36a864afd1beca397383cc9665fd82bd6e791e0174d1e341051313a38853d496b1ebb4762b1476bd674f9b71ba3ca01ffe8c3df05e20e628bf3d483db20f31952689aedbd3e1cdb738a659ea31d2d8777b1f6a283416edc7c80d3afd36ea8767daf09b34dde182bd3820651877684a9521cc74646bb44cf7ae0ceb76095744e16e1ae91ae03d41c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
"from": "0xD70A2e6eACbdeDA77a5d4bBAE3bC70239A0e088f",
"gasLimit": "203986",
"gasPrice": "27792857114",
"hash": "0xe2d788170a5bdfdd4dd5f1da837ad9803966d0aa4ae398c8c59b94eddfa16197",
"maxFeePerGas": "27792857114",
"maxPriorityFeePerGas": "27792857114",
"nonce": 29,
"signature": {
"networkV": null,
"r": "0xbae5e353757af854c2c362a56e499fd605349867d91b6bc39398965d4295a4db",
"s": "0x10dba53247ecea6a91f5e77f2a99d7cb517f85e5ca0bcce1ca52e3f914e27062",
"v": 28
},
"to": "0x7e16116661CA8d66C73612382833153911Fa03B1",
"type": 2,
"value": "0"
}
},
{
"receipt": {
"blockHash": "0x6b4f8d9e02345fb09343402c3c7beda4aac29e5394d9ff033ebe5240fd61dac4",
"blockNumber": 61517655,
"contractAddress": null,
"cumulativeGasUsed": "7917737",
"from": "0xD70A2e6eACbdeDA77a5d4bBAE3bC70239A0e088f",
"gasPrice": "27480466653",
"gasUsed": "95172",
"hash": "0x76371f5f7f3c6dd195f12cba3cdb8521e26aa4f54725d61bac03632f4b0fa1f4",
"index": 44,
"logs": [
{
"address": "0x7e16116661CA8d66C73612382833153911Fa03B1",
"blockHash": "0x6b4f8d9e02345fb09343402c3c7beda4aac29e5394d9ff033ebe5240fd61dac4",
"blockNumber": 61517655,
"data": "0x0000000000000000000000000000000000000000000000000000000000000000",
"index": 221,
"topics": [
"0x572f161235911da04685a68c06adf558fc7e4a36909dca394650e0adc19cc93d",
"0x000000000000000000000000d70a2e6eacbdeda77a5d4bbae3bc70239a0e088f",
"0x0000000000000000000000006dd645a2cc61713bf1cbb369652e0a36c3996fb2",
"0x8fef0197a8e605a453eeba3ca7489aa4756a9ad8575c1d1cc7888f7af1fe0556"
],
"transactionHash": "0x76371f5f7f3c6dd195f12cba3cdb8521e26aa4f54725d61bac03632f4b0fa1f4",
"transactionIndex": 44
},
{
"address": "0xD0a0899c5dc2FEb253D57Ab0b7c6d1b1Fcbbf824",
"blockHash": "0x6b4f8d9e02345fb09343402c3c7beda4aac29e5394d9ff033ebe5240fd61dac4",
"blockNumber": 61517655,
"data": "0x",
"index": 222,
"topics": [
"0x6895c13664aa4f67288b25d7a21d7aaa34916e355fb9b6fae0a139a9085becb8",
"0x0000000000000000000000006dd645a2cc61713bf1cbb369652e0a36c3996fb2"
],
"transactionHash": "0x76371f5f7f3c6dd195f12cba3cdb8521e26aa4f54725d61bac03632f4b0fa1f4",
"transactionIndex": 44
},
{
"address": "0x6dD645A2cC61713Bf1CBB369652e0a36c3996Fb2",
"blockHash": "0x6b4f8d9e02345fb09343402c3c7beda4aac29e5394d9ff033ebe5240fd61dac4",
"blockNumber": 61517655,
"data": "0x0000000000000000000000000000000000000000000000000000000000000001",
"index": 223,
"topics": [
"0xa65fb05c5808f5f389d72edeaf719ce38f4cc55c1f69ca3cbfb31c21501caa07",
"0x7f10aef094c1eb4be68050ef1ec881cee6dd76c00fbcbfec2fa0d092a095f8ce"
],
"transactionHash": "0x76371f5f7f3c6dd195f12cba3cdb8521e26aa4f54725d61bac03632f4b0fa1f4",
"transactionIndex": 44
},
{
"address": "0x6dD645A2cC61713Bf1CBB369652e0a36c3996Fb2",
"blockHash": "0x6b4f8d9e02345fb09343402c3c7beda4aac29e5394d9ff033ebe5240fd61dac4",
"blockNumber": 61517655,
"data": "0x",
"index": 224,
"topics": [
"0x4383d976757d67ca920616be0b6430a681ea9d3dcce8d6d61d4603ca4a9bff63",
"0x7f10aef094c1eb4be68050ef1ec881cee6dd76c00fbcbfec2fa0d092a095f8ce"
],
"transactionHash": "0x76371f5f7f3c6dd195f12cba3cdb8521e26aa4f54725d61bac03632f4b0fa1f4",
"transactionIndex": 44
},
{
"address": "0x0000000000000000000000000000000000001010",
"blockHash": "0x6b4f8d9e02345fb09343402c3c7beda4aac29e5394d9ff033ebe5240fd61dac4",
"blockNumber": 61517655,
"data": "0x00000000000000000000000000000000000000000000000000094aaa816e45cc00000000000000000000000000000000000000000000000194d31059adca73780000000000000000000000000000000000000000000001c2e12342ba9c8b15d600000000000000000000000000000000000000000000000194c9c5af2c5c2dac0000000000000000000000000000000000000000000001c2e12c8d651df95ba2",
"index": 225,
"topics": [
"0x4dfe1bbbcf077ddc3e01291eea2d5c70c2b422b415d95645b9adcfd678cb1d63",
"0x0000000000000000000000000000000000000000000000000000000000001010",
"0x000000000000000000000000d70a2e6eacbdeda77a5d4bbae3bc70239a0e088f",
"0x00000000000000000000000002f70172f7f490653665c9bfac0666147c8af1f5"
],
"transactionHash": "0x76371f5f7f3c6dd195f12cba3cdb8521e26aa4f54725d61bac03632f4b0fa1f4",
"transactionIndex": 44
}
],
"logsBloom": "0x00400000000010000000000000080000000002000000000000000000000000000000000000000000000000000048000000108000000000100000000000000000000000000002200000800000000000800000000000008000002110008000000000000000000000002000000000000400000000000000040080000000000100000000000100000000000100000000000000000000000000000000000000000000204000800000000000000000000000000200000000000400000000001006005000000001000000000001000000000002000000000000000000100000000000000000000000080008000000000000000200000000000000000000000008100000",
"status": 1,
"to": "0x7e16116661CA8d66C73612382833153911Fa03B1"
},
"response": {
"accessList": [],
"blockNumber": 61517655,
"blockHash": "0x6b4f8d9e02345fb09343402c3c7beda4aac29e5394d9ff033ebe5240fd61dac4",
"chainId": "137",
"data": "0xbe6002c20000000000000000000000006dd645a2cc61713bf1cbb369652e0a36c3996fb2000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002a4e65ec46d000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000089000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000012000000000000000000000000065be094765731f394bc6d9df53bdf3376f1fc8b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002104600000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000024231c271c0000000000000000000000002cd1867fb8016f93710b6386f7f9f1d540a60812000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001f47f8feb8db917ecb5c1a85accad605ee003b7129addb403ace557820e5364dc00000000000000000000000000000000000000000000000000000000",
"from": "0xD70A2e6eACbdeDA77a5d4bBAE3bC70239A0e088f",
"gasLimit": "220880",
"gasPrice": "27480466653",
"hash": "0x76371f5f7f3c6dd195f12cba3cdb8521e26aa4f54725d61bac03632f4b0fa1f4",
"maxFeePerGas": "27480466653",
"maxPriorityFeePerGas": "27480466653",
"nonce": 30,
"signature": {
"networkV": null,
"r": "0xeca19e678bb833415e7b6336a198f50313a0b8cb55cb2187ceeb5ccc31944f84",
"s": "0x7f797440c4a494b77b05ec489fa882198d81c1964a37357de9ae1978da504e24",
"v": 28
},
"to": "0x7e16116661CA8d66C73612382833153911Fa03B1",
"type": 2,
"value": "0"
}
}
],
"merkleRoot": "0x7f10aef094c1eb4be68050ef1ec881cee6dd76c00fbcbfec2fa0d092a095f8ce",
"solcInputHashes": [],
"safeAddress": "0xD0a0899c5dc2FEb253D57Ab0b7c6d1b1Fcbbf824",
"moduleAddress": "0x6dD645A2cC61713Bf1CBB369652e0a36c3996Fb2",
"executorAddress": "0x7e16116661CA8d66C73612382833153911Fa03B1",
"nonce": "9",
"chainId": "137",
"actions": [
{
"to": "0x65Be094765731F394bc6d9DF53bDF3376F1Fc8B0",
"value": "0",
"txData": "0x231c271c0000000000000000000000002cd1867fb8016f93710b6386f7f9f1d540a60812",
"gas": "135238",
"operation": 0,
"requireSuccess": true
}
],
"sphinxConfig": {
"projectName": "Helix-DAO",
"orgId": "cluanacaw000111jik4xs4wkl",
"owners": [
"0x00E3993566b34e5367d1C602439997BD08c11FF7",
"0x0f14341A7f464320319025540E8Fe48Ad0fe5aec",
"0x52386BE2397e8EAc26298F733b390684203fB580",
"0x88a39B052d477CfdE47600a7C9950a441Ce61cb4",
"0xe59261f6D4088BcD69985A3D369Ff14cC54EF1E5"
],
"mainnets": [
"polygon-pos"
],
"testnets": [],
"threshold": "3",
"saltNonce": "0"
},
"executionMode": 2,
"initialState": {
"isSafeDeployed": true,
"isModuleDeployed": true,
"isExecuting": false
},
"unlabeledContracts": [],
"arbitraryChain": false,
"libraries": [],
"gitCommit": "deff1295a8ff0d2895aa5972ea01871760422579",
"safeInitData": null
}
Loading

0 comments on commit 7b4cd19

Please sign in to comment.