diff --git a/proposal/0x56657e50ef8879c896a9869b7bf07a9da8d809fbbbe38ce4fe91227328768871/deployment.json b/proposal/0x56657e50ef8879c896a9869b7bf07a9da8d809fbbbe38ce4fe91227328768871/deployment.json index 741261c..1499b92 100644 --- a/proposal/0x56657e50ef8879c896a9869b7bf07a9da8d809fbbbe38ce4fe91227328768871/deployment.json +++ b/proposal/0x56657e50ef8879c896a9869b7bf07a9da8d809fbbbe38ce4fe91227328768871/deployment.json @@ -435,7 +435,7 @@ "ecb9a2d5bf63b21013524697f08bc7f6": { "id": "ecb9a2d5bf63b21013524697f08bc7f6", "solcVersion": "0.8.17", - "solcLongVersion": "0.8.17", + "solcLongVersion": "0.8.17+commit.8df45f5f", "input": { "language": "Solidity", "sources": { @@ -813,7 +813,7 @@ "inputs": [ { "solcVersion": "0.8.17", - "solcLongVersion": "0.8.17", + "solcLongVersion": "0.8.17+commit.8df45f5f", "id": "ecb9a2d5bf63b21013524697f08bc7f6", "input": { "language": "Solidity", @@ -6456,4 +6456,4 @@ "buildInfoId": "ecb9a2d5bf63b21013524697f08bc7f6" } } -} \ No newline at end of file +} diff --git a/proposal/0x80959172dd26e35858e5af42cbaf2946df61e5c7f2b7abd7561ec5cd182510f8/deployment.json b/proposal/0x80959172dd26e35858e5af42cbaf2946df61e5c7f2b7abd7561ec5cd182510f8/deployment.json new file mode 100644 index 0000000..75da0f7 --- /dev/null +++ b/proposal/0x80959172dd26e35858e5af42cbaf2946df61e5c7f2b7abd7561ec5cd182510f8/deployment.json @@ -0,0 +1,401 @@ +{ + "networkConfigs": [ + { + "safeAddress": "0x040f331774Ed6BB161412B4cEDb1358B382aF3A5", + "moduleAddress": "0x3D75d338B4711F8a33d293a2008f07a712513402", + "safeInitData": "0xb63e800d00000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000a238cbeb142c10ef7ad8442c6d1f9e89e07e776100000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000f48f2b2d2a534e402487b3ee7c18c33aec0fe5e4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000e3993566b34e5367d1c602439997bd08c11ff70000000000000000000000000f14341a7f464320319025540e8fe48ad0fe5aec00000000000000000000000052386be2397e8eac26298f733b390684203fb58000000000000000000000000053405fb4d71591e33fe07bfbc90bd82e65720ad00000000000000000000000009f33a4809aa708d7a399fedba514e0a0d15efa8500000000000000000000000000000000000000000000000000000000000001448d80ff0a000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000f2008f3301c9eada5642b5bb12fd047d3ebb2932e619000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000248236d0b80000000000000000000000000000000000000000000000000000000000000000018f3301c9eada5642b5bb12fd047d3ebb2932e6190000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002411ea37fc0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "nonce": "5", + "chainId": "1", + "blockGasLimit": "30000000", + "blockNumber": "20124437", + "newConfig": { + "projectName": "RING-DAO", + "orgId": "cluanacaw000111jik4xs4wkl", + "owners": [ + "0x00E3993566b34e5367d1C602439997BD08c11FF7", + "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec", + "0x52386BE2397e8EAc26298F733b390684203fB580", + "0x53405FB4d71591E33fe07bFbC90bD82E65720ad0", + "0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85" + ], + "mainnets": [ + "ethereum", + "darwinia" + ], + "testnets": [ + "darwinia_koi" + ], + "threshold": "3", + "saltNonce": "0" + }, + "executionMode": 2, + "initialState": { + "isExecuting": false, + "isModuleDeployed": true, + "isSafeDeployed": true + }, + "isSystemDeployed": true, + "actionInputs": [ + { + "actionType": 2, + "contracts": [], + "index": "1", + "decodedAction": { + "referenceName": "0xDc0C760c0fB4672D06088515F6446a71Df0c64C1", + "functionName": "call", + "variables": [ + "0x79ba5097" + ], + "address": "", + "value": "0" + }, + "gas": "142430", + "requireSuccess": true, + "value": "0", + "operation": 0, + "to": "0xDc0C760c0fB4672D06088515F6446a71Df0c64C1", + "txData": "0x79ba5097" + }, + { + "actionType": 2, + "contracts": [], + "index": "2", + "decodedAction": { + "referenceName": "0x02e5C0a36Fb0C83CCEBCD4D6177A7E223D6f0b7c", + "functionName": "call", + "variables": [ + "0x79ba5097" + ], + "address": "", + "value": "0" + }, + "gas": "135459", + "requireSuccess": true, + "value": "0", + "operation": 0, + "to": "0x02e5C0a36Fb0C83CCEBCD4D6177A7E223D6f0b7c", + "txData": "0x79ba5097" + }, + { + "actionType": 2, + "contracts": [], + "index": "3", + "decodedAction": { + "referenceName": "0xDc0C760c0fB4672D06088515F6446a71Df0c64C1", + "functionName": "call", + "variables": [ + "0x2fe5718b000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000002b496f19a420c02490db859fefeccd71edc2c04600000000000000000000000002e5c0a36fb0c83ccebcd4d6177a7e223d6f0b7c" + ], + "address": "", + "value": "0" + }, + "gas": "156734", + "requireSuccess": true, + "value": "0", + "operation": 0, + "to": "0xDc0C760c0fB4672D06088515F6446a71Df0c64C1", + "txData": "0x2fe5718b000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000002b496f19a420c02490db859fefeccd71edc2c04600000000000000000000000002e5c0a36fb0c83ccebcd4d6177a7e223d6f0b7c" + }, + { + "actionType": 2, + "contracts": [], + "index": "4", + "decodedAction": { + "referenceName": "0xDc0C760c0fB4672D06088515F6446a71Df0c64C1", + "functionName": "call", + "variables": [ + "0x8c4cff20000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000002b496f19a420c02490db859fefeccd71edc2c04600000000000000000000000002e5c0a36fb0c83ccebcd4d6177a7e223d6f0b7c" + ], + "address": "", + "value": "0" + }, + "gas": "156675", + "requireSuccess": true, + "value": "0", + "operation": 0, + "to": "0xDc0C760c0fB4672D06088515F6446a71Df0c64C1", + "txData": "0x8c4cff20000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000002b496f19a420c02490db859fefeccd71edc2c04600000000000000000000000002e5c0a36fb0c83ccebcd4d6177a7e223d6f0b7c" + } + ], + "unlabeledContracts": [], + "arbitraryChain": false, + "executorAddress": "0x7e16116661CA8d66C73612382833153911Fa03B1", + "libraries": [], + "gitCommit": "730a8f0d9b08de99fc1af7cf5485fa2e2d9f7333", + "safeFundingRequest": { + "fundsRequested": "0", + "startingBalance": "0" + } + }, + { + "safeAddress": "0x040f331774Ed6BB161412B4cEDb1358B382aF3A5", + "moduleAddress": "0x3D75d338B4711F8a33d293a2008f07a712513402", + "safeInitData": "0xb63e800d00000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000a238cbeb142c10ef7ad8442c6d1f9e89e07e776100000000000000000000000000000000000000000000000000000000000001c0000000000000000000000000f48f2b2d2a534e402487b3ee7c18c33aec0fe5e4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000e3993566b34e5367d1c602439997bd08c11ff70000000000000000000000000f14341a7f464320319025540e8fe48ad0fe5aec00000000000000000000000052386be2397e8eac26298f733b390684203fb58000000000000000000000000053405fb4d71591e33fe07bfbc90bd82e65720ad00000000000000000000000009f33a4809aa708d7a399fedba514e0a0d15efa8500000000000000000000000000000000000000000000000000000000000001448d80ff0a000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000f2008f3301c9eada5642b5bb12fd047d3ebb2932e619000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000248236d0b80000000000000000000000000000000000000000000000000000000000000000018f3301c9eada5642b5bb12fd047d3ebb2932e6190000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002411ea37fc0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", + "nonce": "5", + "chainId": "46", + "blockGasLimit": "20000000", + "blockNumber": "2941101", + "newConfig": { + "projectName": "RING-DAO", + "orgId": "cluanacaw000111jik4xs4wkl", + "owners": [ + "0x00E3993566b34e5367d1C602439997BD08c11FF7", + "0x0f14341A7f464320319025540E8Fe48Ad0fe5aec", + "0x52386BE2397e8EAc26298F733b390684203fB580", + "0x53405FB4d71591E33fe07bFbC90bD82E65720ad0", + "0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85" + ], + "mainnets": [ + "ethereum", + "darwinia" + ], + "testnets": [ + "darwinia_koi" + ], + "threshold": "3", + "saltNonce": "0" + }, + "executionMode": 2, + "initialState": { + "isExecuting": false, + "isModuleDeployed": true, + "isSafeDeployed": true + }, + "isSystemDeployed": true, + "actionInputs": [ + { + "actionType": 2, + "contracts": [], + "index": "1", + "decodedAction": { + "referenceName": "0x2B496f19A420C02490dB859fefeCCD71eDc2c046", + "functionName": "call", + "variables": [ + "0x79ba5097" + ], + "address": "", + "value": "0" + }, + "gas": "11200000", + "requireSuccess": true, + "value": "0", + "operation": 0, + "to": "0x2B496f19A420C02490dB859fefeCCD71eDc2c046", + "txData": "0x79ba5097" + }, + { + "actionType": 2, + "contracts": [], + "index": "2", + "decodedAction": { + "referenceName": "0x682294D1c00A9CA13290b53B7544b8F734D6501f", + "functionName": "call", + "variables": [ + "0x79ba5097" + ], + "address": "", + "value": "0" + }, + "gas": "11200000", + "requireSuccess": true, + "value": "0", + "operation": 0, + "to": "0x682294D1c00A9CA13290b53B7544b8F734D6501f", + "txData": "0x79ba5097" + }, + { + "actionType": 2, + "contracts": [], + "index": "3", + "decodedAction": { + "referenceName": "0x2B496f19A420C02490dB859fefeCCD71eDc2c046", + "functionName": "call", + "variables": [ + "0x2fe5718b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000dc0c760c0fb4672d06088515f6446a71df0c64c1000000000000000000000000682294d1c00a9ca13290b53b7544b8f734d6501f" + ], + "address": "", + "value": "0" + }, + "gas": "11200000", + "requireSuccess": true, + "value": "0", + "operation": 0, + "to": "0x2B496f19A420C02490dB859fefeCCD71eDc2c046", + "txData": "0x2fe5718b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000dc0c760c0fb4672d06088515f6446a71df0c64c1000000000000000000000000682294d1c00a9ca13290b53b7544b8f734d6501f" + }, + { + "actionType": 2, + "contracts": [], + "index": "4", + "decodedAction": { + "referenceName": "0x2B496f19A420C02490dB859fefeCCD71eDc2c046", + "functionName": "call", + "variables": [ + "0x8c4cff200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000dc0c760c0fb4672d06088515f6446a71df0c64c1000000000000000000000000682294d1c00a9ca13290b53b7544b8f734d6501f" + ], + "address": "", + "value": "0" + }, + "gas": "11200000", + "requireSuccess": true, + "value": "0", + "operation": 0, + "to": "0x2B496f19A420C02490dB859fefeCCD71eDc2c046", + "txData": "0x8c4cff200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000dc0c760c0fb4672d06088515f6446a71df0c64c1000000000000000000000000682294d1c00a9ca13290b53b7544b8f734d6501f" + } + ], + "unlabeledContracts": [], + "arbitraryChain": false, + "executorAddress": "0x7e16116661CA8d66C73612382833153911Fa03B1", + "libraries": [], + "gitCommit": "730a8f0d9b08de99fc1af7cf5485fa2e2d9f7333", + "safeFundingRequest": { + "fundsRequested": "0", + "startingBalance": "0" + } + } + ], + "buildInfos": {}, + "inputs": [], + "version": "0.2.0", + "merkleTree": { + "root": "0x80959172dd26e35858e5af42cbaf2946df61e5c7f2b7abd7561ec5cd182510f8", + "leavesWithProofs": [ + { + "leaf": { + "chainId": "1", + "index": "0", + "leafType": 0, + "data": "0x000000000000000000000000040f331774ed6bb161412b4cedb1358b382af3a50000000000000000000000003d75d338b4711f8a33d293a2008f07a712513402000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000050000000000000000000000007e16116661ca8d66c73612382833153911fa03b100000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0x385c9f3b5374fd73676a600e5312ebee5b8c68ce055cf9788d062c0346154113", + "0x8d1b1fde15070f5ac6c2befa5d11dcade154343b20307ece62de4cf1781548b8", + "0x1abdeb86f7849e2808a0b930edde87b94af2c8cefc07c60a21754e86fb8e8f26", + "0xd1b3e7ea94795443c4cfca151f784189f379b73e7f9f65d6cc0c91b40354556b" + ] + }, + { + "leaf": { + "chainId": "1", + "index": "1", + "leafType": 1, + "data": "0x000000000000000000000000dc0c760c0fb4672d06088515f6446a71df0c64c100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022c5e00000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0xb63f9020380b356095ed492dd1d8a2df4527afdb900efdda54cd1bc9934adc74", + "0x3fe0b3230de5a80debe941589230e6b296f8f0e18f5817ce5a5486bb24f9e8ee", + "0x29961eab36763635437434c2fa9f6011313c25862211255981b95fa36b38bda1" + ] + }, + { + "leaf": { + "chainId": "1", + "index": "2", + "leafType": 1, + "data": "0x00000000000000000000000002e5c0a36fb0c83ccebcd4d6177a7e223d6f0b7c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002112300000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0x27cdefb0d205922b56d1a7646c6b59d6615d62295ed8fedc0bbdd9bf5f7dcf59", + "0x8d1b1fde15070f5ac6c2befa5d11dcade154343b20307ece62de4cf1781548b8", + "0x1abdeb86f7849e2808a0b930edde87b94af2c8cefc07c60a21754e86fb8e8f26", + "0xd1b3e7ea94795443c4cfca151f784189f379b73e7f9f65d6cc0c91b40354556b" + ] + }, + { + "leaf": { + "chainId": "1", + "index": "3", + "leafType": 1, + "data": "0x000000000000000000000000dc0c760c0fb4672d06088515f6446a71df0c64c10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002643e00000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000642fe5718b000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000002b496f19a420c02490db859fefeccd71edc2c04600000000000000000000000002e5c0a36fb0c83ccebcd4d6177a7e223d6f0b7c00000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0xe00df01e1b6cf48479d88f1333d419ef1e5b943940f5694a84671a2d091f8b4e", + "0x3f52f78d3c4f757f91e9c59fc270abbbf39159e4dace78310f779c4b519aeec1", + "0x29961eab36763635437434c2fa9f6011313c25862211255981b95fa36b38bda1" + ] + }, + { + "leaf": { + "chainId": "1", + "index": "4", + "leafType": 1, + "data": "0x000000000000000000000000dc0c760c0fb4672d06088515f6446a71df0c64c10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002640300000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000648c4cff20000000000000000000000000000000000000000000000000000000000000002e0000000000000000000000002b496f19a420c02490db859fefeccd71edc2c04600000000000000000000000002e5c0a36fb0c83ccebcd4d6177a7e223d6f0b7c00000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0x60a47108b1705651cecad18c444f37a2ea5d2f1e531736aae8607befe3550c8c", + "0x9ce093fd609cf3670f6de6f0a319858d6836fb166148714cd6fb4d5d506f9793", + "0x1abdeb86f7849e2808a0b930edde87b94af2c8cefc07c60a21754e86fb8e8f26", + "0xd1b3e7ea94795443c4cfca151f784189f379b73e7f9f65d6cc0c91b40354556b" + ] + }, + { + "leaf": { + "chainId": "46", + "index": "0", + "leafType": 0, + "data": "0x000000000000000000000000040f331774ed6bb161412b4cedb1358b382af3a50000000000000000000000003d75d338b4711f8a33d293a2008f07a712513402000000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000050000000000000000000000007e16116661ca8d66c73612382833153911fa03b100000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0xe77f9f75017ae7156ab895f875273af26088c2881ae6ae3301f836a5a0288552", + "0x373f4703eafd5f5d2a38fd05c3d191baa786627ea58a617d9fb65678767c943f", + "0xd1b3e7ea94795443c4cfca151f784189f379b73e7f9f65d6cc0c91b40354556b" + ] + }, + { + "leaf": { + "chainId": "46", + "index": "1", + "leafType": 1, + "data": "0x0000000000000000000000002b496f19a420c02490db859fefeccd71edc2c04600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aae60000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0xe9b17c23fa34db691e87365ec1d5da2f8d3df353331a75b5060b6824102464e3", + "0x373f4703eafd5f5d2a38fd05c3d191baa786627ea58a617d9fb65678767c943f", + "0xd1b3e7ea94795443c4cfca151f784189f379b73e7f9f65d6cc0c91b40354556b" + ] + }, + { + "leaf": { + "chainId": "46", + "index": "2", + "leafType": 1, + "data": "0x000000000000000000000000682294d1c00a9ca13290b53b7544b8f734d6501f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aae60000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000479ba509700000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0xdcd71cc9c6df56d92e7eb395f6e289f1526dde8897c37d993d367181d81e88eb", + "0x3f52f78d3c4f757f91e9c59fc270abbbf39159e4dace78310f779c4b519aeec1", + "0x29961eab36763635437434c2fa9f6011313c25862211255981b95fa36b38bda1" + ] + }, + { + "leaf": { + "chainId": "46", + "index": "3", + "leafType": 1, + "data": "0x0000000000000000000000002b496f19a420c02490db859fefeccd71edc2c04600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aae60000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000642fe5718b0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000dc0c760c0fb4672d06088515f6446a71df0c64c1000000000000000000000000682294d1c00a9ca13290b53b7544b8f734d6501f00000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0x85cd190070f8e866873eaad133582e89bda762435d4fa8efca25331a813cb29d", + "0x3fe0b3230de5a80debe941589230e6b296f8f0e18f5817ce5a5486bb24f9e8ee", + "0x29961eab36763635437434c2fa9f6011313c25862211255981b95fa36b38bda1" + ] + }, + { + "leaf": { + "chainId": "46", + "index": "4", + "leafType": 1, + "data": "0x0000000000000000000000002b496f19a420c02490db859fefeccd71edc2c04600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000aae60000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000648c4cff200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000dc0c760c0fb4672d06088515f6446a71df0c64c1000000000000000000000000682294d1c00a9ca13290b53b7544b8f734d6501f00000000000000000000000000000000000000000000000000000000" + }, + "proof": [ + "0x772dcecdb98054e92d7387bedd1ccba7e6c15b4fe0d56b1cef0caaa229f0df5e", + "0x9ce093fd609cf3670f6de6f0a319858d6836fb166148714cd6fb4d5d506f9793", + "0x1abdeb86f7849e2808a0b930edde87b94af2c8cefc07c60a21754e86fb8e8f26", + "0xd1b3e7ea94795443c4cfca151f784189f379b73e7f9f65d6cc0c91b40354556b" + ] + } + ] + }, + "configArtifacts": {} +} \ No newline at end of file diff --git a/proposal/0x80959172dd26e35858e5af42cbaf2946df61e5c7f2b7abd7561ec5cd182510f8/signature.json b/proposal/0x80959172dd26e35858e5af42cbaf2946df61e5c7f2b7abd7561ec5cd182510f8/signature.json new file mode 100644 index 0000000..37c6a95 --- /dev/null +++ b/proposal/0x80959172dd26e35858e5af42cbaf2946df61e5c7f2b7abd7561ec5cd182510f8/signature.json @@ -0,0 +1,14 @@ +[ + { + "signer": "0x0f14341a7f464320319025540e8fe48ad0fe5aec", + "signature": "0x56c9f2b3a77279688cf079198351b49084858408240ece9d9d61548cd2d990f87f9e740c79eec4068f8fccab9eacff19b1200cad6bdbdee3654963a4c303567e1c" + }, + { + "signer": "0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85", + "signature": "0x591f7084ecfad8f70e9859e49358738fb2cc273d0192bcd29dbbc3305bae75742b09bdfc153d82481b6994ac26d9fc456166589c7c54bc070be2ad4da88269c21c" + }, + { + "signer": "0x53405FB4d71591E33fe07bFbC90bD82E65720ad0", + "signature": "0xdda79a0cc93458c914e949a35855a1a5a1c17c5a3cf4f9b6e77f5876148e3b0d38919e07b1ad22b902d694e83aed4435201075dac4b1bfa532d34461953e19381b" + } +] diff --git a/proposal/0xb44ec8b7eba7706dd210c7f4cbfe8942dfa7bfbf26b583a0cb991d151b0b2ad6/deployment.json b/proposal/0xb44ec8b7eba7706dd210c7f4cbfe8942dfa7bfbf26b583a0cb991d151b0b2ad6/deployment.json index c18e901..c4857f6 100644 --- a/proposal/0xb44ec8b7eba7706dd210c7f4cbfe8942dfa7bfbf26b583a0cb991d151b0b2ad6/deployment.json +++ b/proposal/0xb44ec8b7eba7706dd210c7f4cbfe8942dfa7bfbf26b583a0cb991d151b0b2ad6/deployment.json @@ -1940,7 +1940,7 @@ "522074bb77d1035acef60d9b20c041da": { "id": "522074bb77d1035acef60d9b20c041da", "solcVersion": "0.8.17", - "solcLongVersion": "0.8.17", + "solcLongVersion": "0.8.17+commit.8df45f5f", "input": { "language": "Solidity", "sources": { @@ -2318,7 +2318,7 @@ "inputs": [ { "solcVersion": "0.8.17", - "solcLongVersion": "0.8.17", + "solcLongVersion": "0.8.17+commit.8df45f5f", "id": "522074bb77d1035acef60d9b20c041da", "input": { "language": "Solidity", @@ -9747,4 +9747,4 @@ "buildInfoId": "522074bb77d1035acef60d9b20c041da" } } -} \ No newline at end of file +} diff --git a/script/Proposal.s.sol b/script/Proposal.s.sol index 151a722..33ca3a8 100644 --- a/script/Proposal.s.sol +++ b/script/Proposal.s.sol @@ -1,6 +1,6 @@ // SPDX-License-Identifier: MIT pragma solidity 0.8.17; -import "./ring-dao/Config.s.sol"; +import "./x-token/Config.s.sol"; contract Proposal is ConfigScript {} diff --git a/script/common/Base.sol b/script/common/Base.sol index 7711f47..570b68a 100644 --- a/script/common/Base.sol +++ b/script/common/Base.sol @@ -18,7 +18,7 @@ abstract contract Base is Script, Sphinx, SphinxConstants { function configureSphinx() public override { sphinxConfig.projectName = "RING-DAO"; sphinxConfig.testnets = ["darwinia_koi"]; - // sphinxConfig.mainnets = ["ethereum", "darwinia", "crab", "arbitrum", "blast", "polygon", "moonbeam"]; + sphinxConfig.mainnets = ["ethereum", "darwinia"]; } function CREATE3() public returns (address create3) { diff --git a/script/ring-dao/Config.s.sol b/script/ring-dao/Config.s.sol index 200ee5b..b112818 100644 --- a/script/ring-dao/Config.s.sol +++ b/script/ring-dao/Config.s.sol @@ -2,8 +2,6 @@ pragma solidity 0.8.17; import {Base} from "../common/Base.sol"; -import {TomlTools} from "../common/TomlTools.sol"; -import {stdJson} from "forge-std/StdJson.sol"; import "@openzeppelin/contracts/access/IAccessControl.sol"; diff --git a/script/x-token/Config.s.sol b/script/x-token/Config.s.sol new file mode 100644 index 0000000..79fd913 --- /dev/null +++ b/script/x-token/Config.s.sol @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: MIT +pragma solidity 0.8.17; + +import {Base} from "../common/Base.sol"; + +interface XTokenBase { + struct MessagerService { + address sendService; + address receiveService; + } + + function setSendService(uint256 remoteChainId, address remoteBridge, address service) external; + function setReceiveService(uint256 remoteChainId, address remoteBridge, address service) external; + function messagers(uint256) external view returns (MessagerService memory); +} + +interface IOwnership { + function dao() external view returns (address); + function pendingDao() external view returns (address); + function acceptOwnership() external; +} + +contract ConfigScript is Base { + address backingAddress = 0x2B496f19A420C02490dB859fefeCCD71eDc2c046; + address issuingAddress = 0xDc0C760c0fB4672D06088515F6446a71Df0c64C1; + address oldMessagerOnDarwinia = 0x65Be094765731F394bc6d9DF53bDF3376F1Fc8B0; + address oldMessagerOnEthereum = 0x65Be094765731F394bc6d9DF53bDF3376F1Fc8B0; + address newMessagerOnDarwinia = 0x682294D1c00A9CA13290b53B7544b8F734D6501f; + address newMessagerOnEthereum = 0x02e5C0a36Fb0C83CCEBCD4D6177A7E223D6f0b7c; + + uint256 ETHEREUM_CHAINID = 1; + uint256 DARWINIA_CHAINID = 46; + + function run() public sphinx { + address dao = safeAddress(); + if (block.chainid == DARWINIA_CHAINID) { + if (IOwnership(backingAddress).pendingDao() == dao) { + IOwnership(backingAddress).acceptOwnership(); + } + + if (IOwnership(newMessagerOnDarwinia).pendingDao() == dao) { + IOwnership(newMessagerOnDarwinia).acceptOwnership(); + } + + XTokenBase backing = XTokenBase(backingAddress); + require(backing.messagers(ETHEREUM_CHAINID).sendService == oldMessagerOnDarwinia, "!oldMessager"); + require(backing.messagers(ETHEREUM_CHAINID).receiveService == oldMessagerOnDarwinia, "!oldMessager"); + backing.setSendService(ETHEREUM_CHAINID, issuingAddress, newMessagerOnDarwinia); + backing.setReceiveService(ETHEREUM_CHAINID, issuingAddress, newMessagerOnDarwinia); + require(backing.messagers(ETHEREUM_CHAINID).sendService == newMessagerOnDarwinia, "!newMessager"); + require(backing.messagers(ETHEREUM_CHAINID).receiveService == newMessagerOnDarwinia, "!newMessager"); + } else if (block.chainid == ETHEREUM_CHAINID) { + if (IOwnership(issuingAddress).pendingDao() == dao) { + IOwnership(issuingAddress).acceptOwnership(); + } + + if (IOwnership(newMessagerOnEthereum).pendingDao() == dao) { + IOwnership(newMessagerOnEthereum).acceptOwnership(); + } + + XTokenBase issuing = XTokenBase(issuingAddress); + require(issuing.messagers(DARWINIA_CHAINID).sendService == oldMessagerOnEthereum, "!oldMessager"); + require(issuing.messagers(DARWINIA_CHAINID).receiveService == oldMessagerOnEthereum, "!oldMessager"); + issuing.setSendService(DARWINIA_CHAINID, backingAddress, newMessagerOnEthereum); + issuing.setReceiveService(DARWINIA_CHAINID, backingAddress, newMessagerOnEthereum); + require(issuing.messagers(DARWINIA_CHAINID).sendService == newMessagerOnEthereum, "!newMessager"); + require(issuing.messagers(DARWINIA_CHAINID).receiveService == newMessagerOnEthereum, "!newMessager"); + } + } +}