From b73e8f31a1a9b6d28f70e4861838ee8e7b4600e1 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Fri, 26 Sep 2025 14:18:04 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E7=9A=84=E9=93=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- merlinprivate/DisableMethod.yaml | 53 --- merlinprivate/ModeDispatch.yaml | 24 -- merlinprivate/PublicDisableMethod.json | 21 - merlinprivate/dispatch.yaml | 3 - merlinprivate/fees.json | 441 --------------------- merlinprivate/limiter.yaml | 32 -- near-testnet/dispatch.yaml | 3 - story-odyssey-evm/DisableMethod.yaml | 52 --- story-odyssey-evm/ModeDispatch.yaml | 24 -- story-odyssey-evm/PublicDisableMethod.json | 21 - story-odyssey-evm/dispatch.yaml | 3 - story-odyssey-evm/fees.json | 412 ------------------- ton-testnet/dispatch.yaml | 3 - update-change-log/dispatch.yaml | 3 - update-change-log/readme.md | 1 - xlayer-testnet/DisableMethod.yaml | 52 --- xlayer-testnet/ModeDispatch.yaml | 24 -- xlayer-testnet/PublicDisableMethod.json | 21 - xlayer-testnet/dispatch.yaml | 3 - xlayer-testnet/fees.json | 407 ------------------- 21 files changed, 1 insertion(+), 1604 deletions(-) delete mode 100644 merlinprivate/DisableMethod.yaml delete mode 100644 merlinprivate/ModeDispatch.yaml delete mode 100644 merlinprivate/PublicDisableMethod.json delete mode 100644 merlinprivate/dispatch.yaml delete mode 100644 merlinprivate/fees.json delete mode 100644 merlinprivate/limiter.yaml delete mode 100644 near-testnet/dispatch.yaml delete mode 100644 story-odyssey-evm/DisableMethod.yaml delete mode 100644 story-odyssey-evm/ModeDispatch.yaml delete mode 100644 story-odyssey-evm/PublicDisableMethod.json delete mode 100644 story-odyssey-evm/dispatch.yaml delete mode 100644 story-odyssey-evm/fees.json delete mode 100644 ton-testnet/dispatch.yaml delete mode 100644 update-change-log/dispatch.yaml delete mode 100644 update-change-log/readme.md delete mode 100644 xlayer-testnet/DisableMethod.yaml delete mode 100644 xlayer-testnet/ModeDispatch.yaml delete mode 100644 xlayer-testnet/PublicDisableMethod.json delete mode 100644 xlayer-testnet/dispatch.yaml delete mode 100644 xlayer-testnet/fees.json diff --git a/README.md b/README.md index a39cf4b..651d159 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ # chain-specs -v1.10 +stage 分支 测试使用 diff --git a/merlinprivate/DisableMethod.yaml b/merlinprivate/DisableMethod.yaml deleted file mode 100644 index 433233d..0000000 --- a/merlinprivate/DisableMethod.yaml +++ /dev/null @@ -1,53 +0,0 @@ -# -default: # 等级(所有等级,其它等级没有配置方法时取这里方法配置) - "debug_accountRange": - "debug_backtraceAt": - "debug_blockProfile": - "debug_chaindbCompact": - "debug_chaindbProperty": - "debug_cpuProfile": - "debug_dbAncient": - "debug_dbAncients": - "debug_dbGet": - "debug_dumpBlock": - "debug_freeOSMemory": - "debug_freezeClient": - "debug_gcStats": - "debug_getAccessibleState": - "debug_getBadBlocks": - "debug_getBlockRlp": - "debug_getHeaderRlp": - "debug_getModifiedAccountsByHash": - "debug_getModifiedAccountsByNumber": - "debug_getRawReceipts": - "debug_goTrace": - "debug_intermediateRoots": - "debug_memStats": - "debug_mutexProfile": - "debug_preimage": - "debug_printBlock": - "debug_seedHash": - "debug_setBlockProfileRate": - "debug_setGCPercent": - "debug_setHead": - "debug_setMutexProfileFraction": - "debug_stacks": - "debug_standardTraceBlockToFile": - "debug_standardTraceBadBlockToFile": - "debug_startCPUProfile": - "debug_startGoTrace": - "debug_stopCPUProfile": - "debug_stopGoTrace": - "debug_storageRangeAt": - "debug_traceBadBlock": - "debug_traceBlockFromFile": - "debug_traceChain": - "debug_verbosity": - "debug_vmodule": - "debug_writeBlockProfile": - "debug_writeMemProfile": - "debug_writeMutexProfile": - "trace_callMany": - - "debug_setTrieFlushInterval": - "debug_getTrieFlushInterval": diff --git a/merlinprivate/ModeDispatch.yaml b/merlinprivate/ModeDispatch.yaml deleted file mode 100644 index b3b2048..0000000 --- a/merlinprivate/ModeDispatch.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# 模式分流 -# 目前只支持 full 分流，指定的方法将会被分流到 full 节点处理。 - -# 所有节点类型都支持 -all: - eth_chainId: - eth_syncing: - eth_gasPrice: - eth_estimateGas: - eth_sendRawTransaction: - eth_subscribe: - txpool_inspect: - txpool_status: - txpool_content: - web3_sha3: - web3_clientVersion: - net_listening: - net_peerCount: - -# 只支持 full ，目前 full 是和 archive 混用的，所以设置 full 也基本等于设置 all，作为预留，可以配置。 -full: - -# 被 设置 的方法将分流到 archive 节点，但是目前没有相关收费逻辑，作为预留使用，请 暂时别设置。 -archive: diff --git a/merlinprivate/PublicDisableMethod.json b/merlinprivate/PublicDisableMethod.json deleted file mode 100644 index 126f09d..0000000 --- a/merlinprivate/PublicDisableMethod.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - "txpool_content", - "txpool_inspect", - "debug_traceCall", - "debug_traceBlockByHash", - "debug_traceBlockByNumber", - "debug_traceTransaction", - "trace_block", - "trace_call", - "trace_get", - "trace_filter", - "trace_transaction", - "trace_rawTransaction", - "trace_replayTransaction", - "eth_newFilter", - "eth_newBlockFilter", - "eth_newPendingTransactionFilter", - "eth_getFilterChanges", - "eth_uninstallFilter", - "eth_getFilterLogs" -] diff --git a/merlinprivate/dispatch.yaml b/merlinprivate/dispatch.yaml deleted file mode 100644 index 34c50e3..0000000 --- a/merlinprivate/dispatch.yaml +++ /dev/null @@ -1,3 +0,0 @@ -default_archive: -default: - diff --git a/merlinprivate/fees.json b/merlinprivate/fees.json deleted file mode 100644 index 79fe0f2..0000000 --- a/merlinprivate/fees.json +++ /dev/null @@ -1,441 +0,0 @@ -{ - "methodPrice": [{ - "method": "default", - "calBase": 250, - "ruCost": 5 - }, - { - "method": "net_listening", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "net_version", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "net_peerCount", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "web3_clientVersion", - "calBase": 100000000, - "ruCost": 30, - "cache": true - }, - { - "method": "web3_sha3", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_chainId", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "eth_syncing", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "eth_accounts", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_uninstallFilter", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_blockNumber", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_accountCreated", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getBalance", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getCode", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getTransactionCount", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_isContractAccount", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_sign", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_clientVersion", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_mining", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_hashrate", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_gasPrice", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_gasPriceAt", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_isParallelDBWrite", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_isSenderTxHashIndexingEnabled", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_rewardbase", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_sha3", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_newBlockFilter", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_newFilter", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_newPendingTransactionFilter", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getBlockTransactionCountByNumber", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getBlockTransactionCountByHash", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getCommittee", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getCommitteeSize", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getCouncil", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getCouncilSize", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getStorageAt", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getAccount", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "eth_getFilterChanges", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "eth_call", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "eth_estimateGas", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "eth_estimateComputationCost", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "eth_getAccountKey", - "calBase": 100000000, - "ruCost": 50 - }, - { - "method": "eth_getDecodedAnchoringTransactionByHash", - "calBase": 100000000, - "ruCost": 50 - }, - { - "method": "eth_getHeaderByNumber", - "calBase": 100000000, - "ruCost": 50 - }, - { - "method": "eth_getHeaderByHash", - "calBase": 100000000, - "ruCost": 50 - }, - { - "method": "eth_getTransactionByBlockHashAndIndex", - "calBase": 100000000, - "ruCost": 60 - }, - { - "method": "eth_getTransactionByBlockNumberAndIndex", - "calBase": 100000000, - "ruCost": 60 - }, - { - "method": "eth_signTransaction", - "calBase": 100000000, - "ruCost": 60 - }, - { - "method": "eth_encodeAccountKey", - "calBase": 100000000, - "ruCost": 70 - }, - { - "method": "eth_getTransactionByHash", - "calBase": 100000000, - "ruCost": 70 - }, - { - "method": "eth_getTransactionBySenderTxHash", - "calBase": 100000000, - "ruCost": 70 - }, - { - "method": "eth_signTransactionAsFeePayer", - "calBase": 100000000, - "ruCost": 90 - }, - { - "method": "eth_decodeAccountKey", - "calBase": 100000000, - "ruCost": 100 - }, - { - "method": "eth_getBlockByHash", - "calBase": 100000000, - "ruCost": 40, - "cache": true - }, - { - "method": "eth_getBlockByNumber", - "calBase": 100000000, - "ruCost": 40, - "cache": true - }, - { - "method": "eth_getFilterLogs", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "eth_getLogs", - "calBase": 200000, - "ruCost": 100 - }, - { - "method": "eth_getBlockWithConsensusInfoByHash", - "calBase": 100000000, - "ruCost": 340 - }, - { - "method": "eth_getBlockWithConsensusInfoByNumber", - "calBase": 100000000, - "ruCost": 340 - }, - { - "method": "eth_getTransactionReceipt", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getTransactionReceiptBySenderTxHash", - "calBase": 100000000, - "ruCost": 400 - }, - { - "method": "eth_sendRawTransaction", - "calBase": 100000000, - "ruCost": 50 - }, - { - "method": "eth_sendTransactionAsFeePayer", - "calBase": 100000000, - "ruCost": 400 - }, - { - "method": "eth_getBlockReceipts", - "calBase": 100000000, - "ruCost": 800 - }, - { - "method": "debug_traceTransaction", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceCall", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceBlockByNumber", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceBlockByHash", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "trace_block", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "trace_call", - "calBase": 100000000, - "ruCost": 120 - }, - { - "method": "trace_get", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "trace_rawTransaction", - "calBase": 100000000, - "ruCost": 120 - }, - { - "method": "trace_replayTransaction", - "calBase": 100000000, - "ruCost": 5800 - }, - { - "method": "trace_transaction", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "trace_filter", - "calBase": 100000000, - "ruCost": 120 - }, - { - "method": "txpool_inspect", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "txpool_status", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_getProof", - "calBase": 100000000, - "ruCost": 100 - }, - { - "method": "zkevm_batchNumberByBlockNumber", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "zkevm_consolidatedBlockNumber", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "zkevm_getBatchByNumber", - "calBase": 100000000, - "ruCost": 400 - }, - { - "method": "zkevm_isBlockConsolidated", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "zkevm_isBlockVirtualized", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "zkevm_verifiedBatchNumber", - "calBase": 100000000, - "ruCost": 40 - }, - { - "method": "zkevm_virtualBatchNumber", - "calBase": 100000000, - "ruCost": 40 - } - ], - "nodeTypeRate": { - "default": 1, - "fullNode": 1, - "archiveNode": 1.3 - } -} \ No newline at end of file diff --git a/merlinprivate/limiter.yaml b/merlinprivate/limiter.yaml deleted file mode 100644 index 6da4db3..0000000 --- a/merlinprivate/limiter.yaml +++ /dev/null @@ -1,32 +0,0 @@ -methods: - - name: "default" - maxBatchSize: 1000 # batch Size 由于特殊性，并不支持到具体方法，所以请配置到默认方法 - tracers: ["callTracer", "prestateTracer" ,"fastCallTracer", "stylusTracer", "xNoneTracer", "xEmptyTracer"] - limits: - - level: "L4" - tracers: ["callTracer", "prestateTracer" ,"fastCallTracer", "stylusTracer", "xNoneTracer", "xEmptyTracer", "xCustomTracer"] - - level: "L5" - tracers: ["callTracer", "prestateTracer" ,"fastCallTracer", "stylusTracer", "xNoneTracer", "xEmptyTracer", "xCustomTracer"] - - level: "L6" - tracers: ["callTracer", "prestateTracer" ,"fastCallTracer", "stylusTracer", "xNoneTracer", "xEmptyTracer", "xCustomTracer"] - - level: "L7" - tracers: ["callTracer", "prestateTracer" ,"fastCallTracer", "stylusTracer", "xNoneTracer", "xEmptyTracer", "xCustomTracer"] - - name: "eth_getLogs" - blockRange: 1024 - addressBlockRange: 5000 - # 注释后不生效 没有最大限制 - # xCustomTracer 表示的是是否支持自定义的 tracer - # tracers: ["callTracer", "prestateTracer" ,"fastCallTracer", "stylusTracer", "xNoneTracer", "xEmptyTracer", "xCustomTracer"] - allowRuledLogs: - "0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925": - minTopics: 2 #不为null的topic个数 - "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef": - minTopics: 2 - "0xda9fa7c1b00402c17d0161b249b1ab8bbec047c5a52207b9c112deffd817036b": - minTopics: 2 - "0x17307eab39ab6107e8899845ad3d59bd9653f200f220920489ca2b5937696c31": - minTopics: 2 - "0xc6a377bfc4eb120024a8ac08eef205be16b817020812c73223e81d1bdb9708ec": - minTopics: 2 - "0x89b1add15eff56b3dfe299ad94e01f2b52fbcb80ae1a3baea6ae8c04cb2b98a4": - minTopics: 2 diff --git a/near-testnet/dispatch.yaml b/near-testnet/dispatch.yaml deleted file mode 100644 index 34c50e3..0000000 --- a/near-testnet/dispatch.yaml +++ /dev/null @@ -1,3 +0,0 @@ -default_archive: -default: - diff --git a/story-odyssey-evm/DisableMethod.yaml b/story-odyssey-evm/DisableMethod.yaml deleted file mode 100644 index 43eeef4..0000000 --- a/story-odyssey-evm/DisableMethod.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# -default: # 等级(所有等级,其它等级没有配置方法时取这里方法配置) - "debug_accountRange": - "debug_backtraceAt": - "debug_blockProfile": - "debug_chaindbCompact": - "debug_chaindbProperty": - "debug_cpuProfile": - "debug_dbAncient": - "debug_dbAncients": - "debug_dbGet": - "debug_dumpBlock": - "debug_freeOSMemory": - "debug_freezeClient": - "debug_gcStats": - "debug_getAccessibleState": - "debug_getBadBlocks": - "debug_getBlockRlp": - "debug_getHeaderRlp": - "debug_getModifiedAccountsByHash": - "debug_getModifiedAccountsByNumber": - "debug_getRawReceipts": - "debug_goTrace": - "debug_intermediateRoots": - "debug_memStats": - "debug_mutexProfile": - "debug_preimage": - "debug_printBlock": - "debug_seedHash": - "debug_setBlockProfileRate": - "debug_setGCPercent": - "debug_setHead": - "debug_setMutexProfileFraction": - "debug_stacks": - "debug_standardTraceBlockToFile": - "debug_standardTraceBadBlockToFile": - "debug_startCPUProfile": - "debug_startGoTrace": - "debug_stopCPUProfile": - "debug_stopGoTrace": - "debug_storageRangeAt": - "debug_traceBadBlock": - "debug_traceBlock": - "debug_traceBlockFromFile": - "debug_traceChain": - "debug_verbosity": - "debug_vmodule": - "debug_writeBlockProfile": - "debug_writeMemProfile": - "debug_writeMutexProfile": - "trace_callMany": - diff --git a/story-odyssey-evm/ModeDispatch.yaml b/story-odyssey-evm/ModeDispatch.yaml deleted file mode 100644 index b3b2048..0000000 --- a/story-odyssey-evm/ModeDispatch.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# 模式分流 -# 目前只支持 full 分流，指定的方法将会被分流到 full 节点处理。 - -# 所有节点类型都支持 -all: - eth_chainId: - eth_syncing: - eth_gasPrice: - eth_estimateGas: - eth_sendRawTransaction: - eth_subscribe: - txpool_inspect: - txpool_status: - txpool_content: - web3_sha3: - web3_clientVersion: - net_listening: - net_peerCount: - -# 只支持 full ，目前 full 是和 archive 混用的，所以设置 full 也基本等于设置 all，作为预留，可以配置。 -full: - -# 被 设置 的方法将分流到 archive 节点，但是目前没有相关收费逻辑，作为预留使用，请 暂时别设置。 -archive: diff --git a/story-odyssey-evm/PublicDisableMethod.json b/story-odyssey-evm/PublicDisableMethod.json deleted file mode 100644 index 126f09d..0000000 --- a/story-odyssey-evm/PublicDisableMethod.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - "txpool_content", - "txpool_inspect", - "debug_traceCall", - "debug_traceBlockByHash", - "debug_traceBlockByNumber", - "debug_traceTransaction", - "trace_block", - "trace_call", - "trace_get", - "trace_filter", - "trace_transaction", - "trace_rawTransaction", - "trace_replayTransaction", - "eth_newFilter", - "eth_newBlockFilter", - "eth_newPendingTransactionFilter", - "eth_getFilterChanges", - "eth_uninstallFilter", - "eth_getFilterLogs" -] diff --git a/story-odyssey-evm/dispatch.yaml b/story-odyssey-evm/dispatch.yaml deleted file mode 100644 index 34c50e3..0000000 --- a/story-odyssey-evm/dispatch.yaml +++ /dev/null @@ -1,3 +0,0 @@ -default_archive: -default: - diff --git a/story-odyssey-evm/fees.json b/story-odyssey-evm/fees.json deleted file mode 100644 index 04e4c5a..0000000 --- a/story-odyssey-evm/fees.json +++ /dev/null @@ -1,412 +0,0 @@ -{ - "methodPrice": [ - { - "method": "default", - "calBase": 250, - "ruCost": 5 - }, - { - "method": "net_listening", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "net_version", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "net_peerCount", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "web3_clientVersion", - "calBase": 100000000, - "ruCost": 15, - "cache": true - }, - { - "method": "web3_sha3", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_chainId", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "eth_syncing", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "eth_accounts", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "eth_uninstallFilter", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "eth_blockNumber", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "eth_accountCreated", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getBalance", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCode", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getTransactionCount", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_isContractAccount", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_sign", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_clientVersion", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_mining", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_hashrate", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_gasPrice", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_gasPriceAt", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_isParallelDBWrite", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_isSenderTxHashIndexingEnabled", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_rewardbase", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_sha3", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_newBlockFilter", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_newFilter", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_newPendingTransactionFilter", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getBlockTransactionCountByNumber", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getBlockTransactionCountByHash", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCommittee", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCommitteeSize", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCouncil", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCouncilSize", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getStorageAt", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getAccount", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_getFilterChanges", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_call", - "calBase": 10000, - "ruCost": 20 - }, - { - "method": "eth_feeHistory", - "calBase": 100000000, - "ruCost": 1200 - }, - { - "method": "eth_estimateGas", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_estimateComputationCost", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_getAccountKey", - "calBase": 100000000, - "ruCost": 25 - }, - { - "method": "eth_getDecodedAnchoringTransactionByHash", - "calBase": 100000000, - "ruCost": 25 - }, - { - "method": "eth_getHeaderByNumber", - "calBase": 100000000, - "ruCost": 25 - }, - { - "method": "eth_getHeaderByHash", - "calBase": 100000000, - "ruCost": 25 - }, - { - "method": "eth_getTransactionByBlockHashAndIndex", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getTransactionByBlockNumberAndIndex", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_signTransaction", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_encodeAccountKey", - "calBase": 100000000, - "ruCost": 35 - }, - { - "method": "eth_getTransactionByHash", - "calBase": 100000000, - "ruCost": 35 - }, - { - "method": "eth_getTransactionBySenderTxHash", - "calBase": 100000000, - "ruCost": 35 - }, - { - "method": "eth_signTransactionAsFeePayer", - "calBase": 100000000, - "ruCost": 45 - }, - { - "method": "eth_decodeAccountKey", - "calBase": 100000000, - "ruCost": 50 - }, - { - "method": "eth_getBlockByHash", - "calBase": 100000000, - "ruCost": 20, - "cache": true - }, - { - "method": "eth_getBlockByNumber", - "calBase": 100000000, - "ruCost": 20, - "cache": true - }, - { - "method": "eth_getFilterLogs", - "calBase": 100000000, - "ruCost": 75 - }, - { - "method": "eth_getLogs", - "calBase": 200000, - "ruCost": 50 - }, - { - "method": "eth_getBlockWithConsensusInfoByHash", - "calBase": 100000000, - "ruCost": 170 - }, - { - "method": "eth_getBlockWithConsensusInfoByNumber", - "calBase": 100000000, - "ruCost": 170 - }, - { - "method": "eth_getTransactionReceipt", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getTransactionReceiptBySenderTxHash", - "calBase": 100000000, - "ruCost": 200 - }, - { - "method": "eth_sendRawTransaction", - "calBase": 100000000, - "ruCost": 50 - }, - { - "method": "eth_sendTransactionAsFeePayer", - "calBase": 100000000, - "ruCost": 200 - }, - { - "method": "eth_getBlockReceipts", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceTransaction", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceCall", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceBlockByNumber", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceBlockByHash", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "trace_block", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "trace_call", - "calBase": 100000000, - "ruCost": 60 - }, - { - "method": "trace_get", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "trace_rawTransaction", - "calBase": 100000000, - "ruCost": 60 - }, - { - "method": "trace_replayTransaction", - "calBase": 100000000, - "ruCost": 2900 - }, - { - "method": "trace_transaction", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "trace_filter", - "calBase": 100000000, - "ruCost": 60 - }, - { - "method": "txpool_inspect", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "txpool_status", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "eth_getProof", - "calBase": 100000000, - "ruCost": 50 - } - ], - "nodeTypeRate": { - "default": 1, - "fullNode": 1, - "archiveNode": 1.3 - } -} \ No newline at end of file diff --git a/ton-testnet/dispatch.yaml b/ton-testnet/dispatch.yaml deleted file mode 100644 index 34c50e3..0000000 --- a/ton-testnet/dispatch.yaml +++ /dev/null @@ -1,3 +0,0 @@ -default_archive: -default: - diff --git a/update-change-log/dispatch.yaml b/update-change-log/dispatch.yaml deleted file mode 100644 index 34c50e3..0000000 --- a/update-change-log/dispatch.yaml +++ /dev/null @@ -1,3 +0,0 @@ -default_archive: -default: - diff --git a/update-change-log/readme.md b/update-change-log/readme.md deleted file mode 100644 index 9daeafb..0000000 --- a/update-change-log/readme.md +++ /dev/null @@ -1 +0,0 @@ -test diff --git a/xlayer-testnet/DisableMethod.yaml b/xlayer-testnet/DisableMethod.yaml deleted file mode 100644 index 43eeef4..0000000 --- a/xlayer-testnet/DisableMethod.yaml +++ /dev/null @@ -1,52 +0,0 @@ -# -default: # 等级(所有等级,其它等级没有配置方法时取这里方法配置) - "debug_accountRange": - "debug_backtraceAt": - "debug_blockProfile": - "debug_chaindbCompact": - "debug_chaindbProperty": - "debug_cpuProfile": - "debug_dbAncient": - "debug_dbAncients": - "debug_dbGet": - "debug_dumpBlock": - "debug_freeOSMemory": - "debug_freezeClient": - "debug_gcStats": - "debug_getAccessibleState": - "debug_getBadBlocks": - "debug_getBlockRlp": - "debug_getHeaderRlp": - "debug_getModifiedAccountsByHash": - "debug_getModifiedAccountsByNumber": - "debug_getRawReceipts": - "debug_goTrace": - "debug_intermediateRoots": - "debug_memStats": - "debug_mutexProfile": - "debug_preimage": - "debug_printBlock": - "debug_seedHash": - "debug_setBlockProfileRate": - "debug_setGCPercent": - "debug_setHead": - "debug_setMutexProfileFraction": - "debug_stacks": - "debug_standardTraceBlockToFile": - "debug_standardTraceBadBlockToFile": - "debug_startCPUProfile": - "debug_startGoTrace": - "debug_stopCPUProfile": - "debug_stopGoTrace": - "debug_storageRangeAt": - "debug_traceBadBlock": - "debug_traceBlock": - "debug_traceBlockFromFile": - "debug_traceChain": - "debug_verbosity": - "debug_vmodule": - "debug_writeBlockProfile": - "debug_writeMemProfile": - "debug_writeMutexProfile": - "trace_callMany": - diff --git a/xlayer-testnet/ModeDispatch.yaml b/xlayer-testnet/ModeDispatch.yaml deleted file mode 100644 index b3b2048..0000000 --- a/xlayer-testnet/ModeDispatch.yaml +++ /dev/null @@ -1,24 +0,0 @@ -# 模式分流 -# 目前只支持 full 分流，指定的方法将会被分流到 full 节点处理。 - -# 所有节点类型都支持 -all: - eth_chainId: - eth_syncing: - eth_gasPrice: - eth_estimateGas: - eth_sendRawTransaction: - eth_subscribe: - txpool_inspect: - txpool_status: - txpool_content: - web3_sha3: - web3_clientVersion: - net_listening: - net_peerCount: - -# 只支持 full ，目前 full 是和 archive 混用的，所以设置 full 也基本等于设置 all，作为预留，可以配置。 -full: - -# 被 设置 的方法将分流到 archive 节点，但是目前没有相关收费逻辑，作为预留使用，请 暂时别设置。 -archive: diff --git a/xlayer-testnet/PublicDisableMethod.json b/xlayer-testnet/PublicDisableMethod.json deleted file mode 100644 index 126f09d..0000000 --- a/xlayer-testnet/PublicDisableMethod.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - "txpool_content", - "txpool_inspect", - "debug_traceCall", - "debug_traceBlockByHash", - "debug_traceBlockByNumber", - "debug_traceTransaction", - "trace_block", - "trace_call", - "trace_get", - "trace_filter", - "trace_transaction", - "trace_rawTransaction", - "trace_replayTransaction", - "eth_newFilter", - "eth_newBlockFilter", - "eth_newPendingTransactionFilter", - "eth_getFilterChanges", - "eth_uninstallFilter", - "eth_getFilterLogs" -] diff --git a/xlayer-testnet/dispatch.yaml b/xlayer-testnet/dispatch.yaml deleted file mode 100644 index 34c50e3..0000000 --- a/xlayer-testnet/dispatch.yaml +++ /dev/null @@ -1,3 +0,0 @@ -default_archive: -default: - diff --git a/xlayer-testnet/fees.json b/xlayer-testnet/fees.json deleted file mode 100644 index 9d49d6d..0000000 --- a/xlayer-testnet/fees.json +++ /dev/null @@ -1,407 +0,0 @@ -{ - "methodPrice": [ - { - "method": "default", - "calBase": 250, - "ruCost": 5 - }, - { - "method": "net_listening", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "net_version", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "net_peerCount", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "web3_clientVersion", - "calBase": 100000000, - "ruCost": 15, - "cache": true - }, - { - "method": "web3_sha3", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_chainId", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "eth_syncing", - "calBase": 100000000, - "ruCost": 5, - "cache": true - }, - { - "method": "eth_accounts", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "eth_uninstallFilter", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "eth_blockNumber", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "eth_accountCreated", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getBalance", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCode", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getTransactionCount", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_isContractAccount", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_sign", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_clientVersion", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_mining", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_hashrate", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_gasPrice", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_gasPriceAt", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_isParallelDBWrite", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_isSenderTxHashIndexingEnabled", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_rewardbase", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_sha3", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_newBlockFilter", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_newFilter", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_newPendingTransactionFilter", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getBlockTransactionCountByNumber", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getBlockTransactionCountByHash", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCommittee", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCommitteeSize", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCouncil", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getCouncilSize", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getStorageAt", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getAccount", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_getFilterChanges", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_call", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_estimateGas", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_estimateComputationCost", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "eth_getAccountKey", - "calBase": 100000000, - "ruCost": 25 - }, - { - "method": "eth_getDecodedAnchoringTransactionByHash", - "calBase": 100000000, - "ruCost": 25 - }, - { - "method": "eth_getHeaderByNumber", - "calBase": 100000000, - "ruCost": 25 - }, - { - "method": "eth_getHeaderByHash", - "calBase": 100000000, - "ruCost": 25 - }, - { - "method": "eth_getTransactionByBlockHashAndIndex", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_getTransactionByBlockNumberAndIndex", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_signTransaction", - "calBase": 100000000, - "ruCost": 30 - }, - { - "method": "eth_encodeAccountKey", - "calBase": 100000000, - "ruCost": 35 - }, - { - "method": "eth_getTransactionByHash", - "calBase": 100000000, - "ruCost": 35 - }, - { - "method": "eth_getTransactionBySenderTxHash", - "calBase": 100000000, - "ruCost": 35 - }, - { - "method": "eth_signTransactionAsFeePayer", - "calBase": 100000000, - "ruCost": 45 - }, - { - "method": "eth_decodeAccountKey", - "calBase": 100000000, - "ruCost": 50 - }, - { - "method": "eth_getBlockByHash", - "calBase": 100000000, - "ruCost": 20, - "cache": true - }, - { - "method": "eth_getBlockByNumber", - "calBase": 100000000, - "ruCost": 20, - "cache": true - }, - { - "method": "eth_getFilterLogs", - "calBase": 100000000, - "ruCost": 75 - }, - { - "method": "eth_getLogs", - "calBase": 200000, - "ruCost": 50 - }, - { - "method": "eth_getBlockWithConsensusInfoByHash", - "calBase": 100000000, - "ruCost": 170 - }, - { - "method": "eth_getBlockWithConsensusInfoByNumber", - "calBase": 100000000, - "ruCost": 170 - }, - { - "method": "eth_getTransactionReceipt", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "eth_getTransactionReceiptBySenderTxHash", - "calBase": 100000000, - "ruCost": 200 - }, - { - "method": "eth_sendRawTransaction", - "calBase": 100000000, - "ruCost": 50 - }, - { - "method": "eth_sendTransactionAsFeePayer", - "calBase": 100000000, - "ruCost": 200 - }, - { - "method": "eth_getBlockReceipts", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceTransaction", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceCall", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceBlockByNumber", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "debug_traceBlockByHash", - "calBase": 100000000, - "ruCost": 150 - }, - { - "method": "trace_block", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "trace_call", - "calBase": 100000000, - "ruCost": 60 - }, - { - "method": "trace_get", - "calBase": 100000000, - "ruCost": 15 - }, - { - "method": "trace_rawTransaction", - "calBase": 100000000, - "ruCost": 60 - }, - { - "method": "trace_replayTransaction", - "calBase": 100000000, - "ruCost": 2900 - }, - { - "method": "trace_transaction", - "calBase": 100000000, - "ruCost": 20 - }, - { - "method": "trace_filter", - "calBase": 100000000, - "ruCost": 60 - }, - { - "method": "txpool_inspect", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "txpool_status", - "calBase": 100000000, - "ruCost": 10 - }, - { - "method": "eth_getProof", - "calBase": 100000000, - "ruCost": 50 - } - ], - "nodeTypeRate": { - "default": 1, - "fullNode": 1, - "archiveNode": 1.3 - } -} \ No newline at end of file From 0e294a5e1ec5e590dfa50676f4faec76188ed0df Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 10:47:10 +0800 Subject: [PATCH 02/16] Create test.txt --- test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 test.txt diff --git a/test.txt b/test.txt new file mode 100644 index 0000000..30d74d2 --- /dev/null +++ b/test.txt @@ -0,0 +1 @@ +test \ No newline at end of file From e50ec6b7cfd93b8d729023646f805ec79b234a46 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 15:19:29 +0800 Subject: [PATCH 03/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index eda24dc..60faf99 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -10,24 +10,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Cache AWS CLI - id: cache-aws-cli - uses: actions/cache@v4 # 使用 GitHub Actions 缓存 - with: - path: ~/.aws/cli # 缓存 AWS CLI 的安装路径 - key: ${{ runner.os }}-aws-cli-${{ hashFiles('install-aws-cli.sh') }} # 缓存键，根据操作系统和安装脚本内容生成 - restore-keys: | - ${{ runner.os }}-aws-cli- - - - name: Install AWS CLI # 仅在缓存未命中时安装 - if: steps.cache-aws-cli.outputs.cache-hit != 'true' - run: | - curl "https://s3.amazonaws.com/aws-cli/awscli-bundle.zip" -o "awscli-bundle.zip" - unzip awscli-bundle.zip - sudo ./awscli-bundle/install -i /usr/local/aws -b /usr/local/bin/aws - # 将安装目录添加到 PATH，以便后续步骤可以直接使用 aws 命令 - echo "/usr/local/bin" >> $GITHUB_PATH - - name: Configure AWS CLI for Cloudflare R2 run: | aws configure set aws_access_key_id ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} From 41b74e68506213e17bcb19163d2389775be8e090 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 15:25:23 +0800 Subject: [PATCH 04/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index 60faf99..4095950 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -10,13 +10,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Configure AWS CLI for Cloudflare R2 - run: | - aws configure set aws_access_key_id ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} - aws configure set aws_secret_access_key ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - env: - CLOUDFLARE_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} - CLOUDFLARE_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} + - name: Configure AWS Credentials for Cloudflare R2 + uses: aws-actions/configure-aws-credentials@v4 + with: + aws-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - name: Get Branch Name and Set R2 Target Path id: set_path From f3a78d99c6dea4692477284692259d90bb4d3422 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 15:28:48 +0800 Subject: [PATCH 05/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index 4095950..0968ced 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -15,20 +15,12 @@ jobs: with: aws-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - - - name: Get Branch Name and Set R2 Target Path - id: set_path - run: | - BRANCH_NAME="${{ github.ref_name }}" - echo "R2_TARGET_PATH=${{ secrets.R2_PREFIX_DIR }}/$BRANCH_NAME" >> "$GITHUB_OUTPUT" - echo "R2 target path will be: ${{ secrets.R2_PREFIX_DIR }}/$BRANCH_NAME" - env: - # 如果 R2_PREFIX_DIR 始终为空或您不希望使用它，可以考虑移除此 env 块 - # 或者确保 R2_PREFIX_DIR 在您的 GitHub secrets 中定义为空字符串 - R2_PREFIX_DIR: ${{ secrets.R2_PREFIX_DIR || '' }} # 优先使用 Secret，如果 Secret不存在则默认为空 + aws-region: us-west-1 - name: Upload to Cloudflare R2 run: | + BRANCH_NAME="${{ github.ref_name }}" + R2_TARGET_PATH=${{ secrets.R2_PREFIX_DIR }}/$BRANCH_NAME" aws s3 sync . s3://${{ secrets.R2_BUCKET_NAME }}/${{ steps.set_path.outputs.R2_TARGET_PATH }}/ \ --endpoint-url=${{ secrets.R2_ENDPOINT_URL }} \ --delete \ @@ -40,3 +32,5 @@ jobs: env: R2_BUCKET_NAME: ${{ secrets.R2_BUCKET_NAME }} R2_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT_URL }} + R2_PREFIX_DIR: ${{ secrets.R2_PREFIX_DIR || '' }} + From 537e314a3f847bd32e064fd34c23051e017dcb4f Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 15:40:10 +0800 Subject: [PATCH 06/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index 0968ced..5abdf63 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -10,27 +10,15 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Configure AWS Credentials for Cloudflare R2 - uses: aws-actions/configure-aws-credentials@v4 + - uses: ryand56/r2-upload-action@latest with: - aws-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - aws-region: us-west-1 - - - name: Upload to Cloudflare R2 - run: | - BRANCH_NAME="${{ github.ref_name }}" - R2_TARGET_PATH=${{ secrets.R2_PREFIX_DIR }}/$BRANCH_NAME" - aws s3 sync . s3://${{ secrets.R2_BUCKET_NAME }}/${{ steps.set_path.outputs.R2_TARGET_PATH }}/ \ - --endpoint-url=${{ secrets.R2_ENDPOINT_URL }} \ - --delete \ - --exclude ".git/*" \ - --exclude ".github/*" \ - --exclude "awscli-bundle/*" \ - --exclude "awscli-bundle.zip" \ - --exact-timestamps + r2-account-id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} + r2-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} + r2-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} + r2-bucket: ${{ secrets.R2_BUCKET_NAME }} + source-dir: src + destination-dir: ${{ secrets.R2_PREFIX_DIR || '' }}/${{ github.ref_name || '' }}/ env: R2_BUCKET_NAME: ${{ secrets.R2_BUCKET_NAME }} R2_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT_URL }} R2_PREFIX_DIR: ${{ secrets.R2_PREFIX_DIR || '' }} - From 043b728e47fdf2997845b23071173219089e12e1 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 15:40:43 +0800 Subject: [PATCH 07/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index 5abdf63..a12cc41 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -16,9 +16,6 @@ jobs: r2-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} r2-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} r2-bucket: ${{ secrets.R2_BUCKET_NAME }} - source-dir: src + source-dir: ./ destination-dir: ${{ secrets.R2_PREFIX_DIR || '' }}/${{ github.ref_name || '' }}/ - env: - R2_BUCKET_NAME: ${{ secrets.R2_BUCKET_NAME }} - R2_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT_URL }} - R2_PREFIX_DIR: ${{ secrets.R2_PREFIX_DIR || '' }} + From 7ce7a9680f9d0bd02ca8ef7d8049526ab3bd4297 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 15:46:47 +0800 Subject: [PATCH 08/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index a12cc41..a21edbf 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -10,12 +10,13 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - uses: ryand56/r2-upload-action@latest + - name: 上传数据 + uses: ryand56/r2-upload-action@latest with: r2-account-id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} r2-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} r2-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} r2-bucket: ${{ secrets.R2_BUCKET_NAME }} - source-dir: ./ + source-dir: . destination-dir: ${{ secrets.R2_PREFIX_DIR || '' }}/${{ github.ref_name || '' }}/ - + delete-removed: true From 364ccc3ae1941c28a65ded6c24a3f7b4e20be1d3 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 15:49:04 +0800 Subject: [PATCH 09/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index a21edbf..3451340 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -19,4 +19,4 @@ jobs: r2-bucket: ${{ secrets.R2_BUCKET_NAME }} source-dir: . destination-dir: ${{ secrets.R2_PREFIX_DIR || '' }}/${{ github.ref_name || '' }}/ - delete-removed: true + From 364146dfbf4190cf086706e6dd0d44b64f9e848d Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 16:00:15 +0800 Subject: [PATCH 10/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index 3451340..40fb774 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -11,12 +11,13 @@ jobs: uses: actions/checkout@v4 - name: 上传数据 - uses: ryand56/r2-upload-action@latest + uses: jakejarvis/s3-sync-action@master with: - r2-account-id: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }} - r2-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} - r2-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - r2-bucket: ${{ secrets.R2_BUCKET_NAME }} - source-dir: . - destination-dir: ${{ secrets.R2_PREFIX_DIR || '' }}/${{ github.ref_name || '' }}/ - + args: --acl public-read --follow-symlinks --delete --exclude ".git/*" --exclude ".github/*" + env: + AWS_S3_BUCKET: ${{ secrets.R2_BUCKET_NAME }} + AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} + AWS_REGION: 'us-west-1' + SOURCE_DIR: './' + DEST_DIR: ${{ secrets.R2_PREFIX_DIR || '' }}/${{ github.ref_name || '' }}/ \ No newline at end of file From 4a38b20dbea8e10c677d4b40ac03e179010813f7 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 16:03:55 +0800 Subject: [PATCH 11/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index 40fb774..e55a42b 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -13,11 +13,11 @@ jobs: - name: 上传数据 uses: jakejarvis/s3-sync-action@master with: - args: --acl public-read --follow-symlinks --delete --exclude ".git/*" --exclude ".github/*" + args: --follow-symlinks --delete env: AWS_S3_BUCKET: ${{ secrets.R2_BUCKET_NAME }} AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} AWS_REGION: 'us-west-1' SOURCE_DIR: './' - DEST_DIR: ${{ secrets.R2_PREFIX_DIR || '' }}/${{ github.ref_name || '' }}/ \ No newline at end of file + DEST_DIR: ${{ secrets.R2_PREFIX_DIR || '' }}/${{ github.ref_name || '' }}/ From e9ce45111081a54e5e5ae138ee0b57d0063d49e4 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 16:09:56 +0800 Subject: [PATCH 12/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index e55a42b..9a6a53f 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -10,14 +10,24 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: 上传数据 - uses: jakejarvis/s3-sync-action@master + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v1 with: - args: --follow-symlinks --delete + aws-access-key-id: ${{ secrets. CLOUDFLARE_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets. CLOUDFLARE_SECRET_ACCESS_KEY }} + aws-region: us-west-1 + + - name: Upload to Cloudflare R2 + run: | + aws s3 sync . s3://${{ secrets.R2_BUCKET_NAME }}/${{ secrets.R2_PREFIX_DIR }}/${{ github.ref_name }}/ \ + --endpoint-url=${{ secrets.R2_ENDPOINT_URL }} \ + --delete \ + --exclude ".git/*" \ + --exclude ".github/*" \ + --exclude "awscli-bundle/*" \ + --exclude "awscli-bundle.zip" \ + --exact-timestamps env: - AWS_S3_BUCKET: ${{ secrets.R2_BUCKET_NAME }} - AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - AWS_REGION: 'us-west-1' - SOURCE_DIR: './' - DEST_DIR: ${{ secrets.R2_PREFIX_DIR || '' }}/${{ github.ref_name || '' }}/ + R2_BUCKET_NAME: ${{ secrets.R2_BUCKET_NAME }} + R2_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT_URL }} + R2_PREFIX_DIR: ${{ secrets.R2_PREFIX_DIR || '' }} From a96fefc9b49beca709e1ef1b33fbb0641cf86f8d Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 16:10:59 +0800 Subject: [PATCH 13/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index 9a6a53f..9e80fc2 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -13,8 +13,8 @@ jobs: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v1 with: - aws-access-key-id: ${{ secrets. CLOUDFLARE_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets. CLOUDFLARE_SECRET_ACCESS_KEY }} + aws-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} aws-region: us-west-1 - name: Upload to Cloudflare R2 From bfcb6a7d756cb65c9aa045060b2db87e6c4c82f8 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 16:14:09 +0800 Subject: [PATCH 14/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index 9e80fc2..8fd504f 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -11,7 +11,7 @@ jobs: uses: actions/checkout@v4 - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v1 + uses: aws-actions/configure-aws-credentials@v5.0.0 with: aws-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} From 79e0a0c73598b95f2f1044888f325f2b9561c949 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 16:16:50 +0800 Subject: [PATCH 15/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index 8fd504f..c98805d 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -10,13 +10,6 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Configure AWS Credentials - uses: aws-actions/configure-aws-credentials@v5.0.0 - with: - aws-access-key-id: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - aws-region: us-west-1 - - name: Upload to Cloudflare R2 run: | aws s3 sync . s3://${{ secrets.R2_BUCKET_NAME }}/${{ secrets.R2_PREFIX_DIR }}/${{ github.ref_name }}/ \ @@ -31,3 +24,6 @@ jobs: R2_BUCKET_NAME: ${{ secrets.R2_BUCKET_NAME }} R2_ENDPOINT_URL: ${{ secrets.R2_ENDPOINT_URL }} R2_PREFIX_DIR: ${{ secrets.R2_PREFIX_DIR || '' }} + AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} + AWS_DEFAULT_REGION: us-west-1 \ No newline at end of file From 1a1825f3c055241ceb5b6312197ecc0de8c62837 Mon Sep 17 00:00:00 2001 From: blockPI-rayn Date: Sun, 28 Sep 2025 16:18:25 +0800 Subject: [PATCH 16/16] Update syncToR2.yml --- .github/workflows/syncToR2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/syncToR2.yml b/.github/workflows/syncToR2.yml index c98805d..3ea8670 100644 --- a/.github/workflows/syncToR2.yml +++ b/.github/workflows/syncToR2.yml @@ -26,4 +26,4 @@ jobs: R2_PREFIX_DIR: ${{ secrets.R2_PREFIX_DIR || '' }} AWS_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_ACCESS_KEY_ID }} AWS_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_SECRET_ACCESS_KEY }} - AWS_DEFAULT_REGION: us-west-1 \ No newline at end of file + AWS_DEFAULT_REGION: wnam