0d08d4e11f
Some checks failed
CI/CD Pipeline / Solidity Contracts (push) Failing after 1m4s
CI/CD Pipeline / Security Scanning (push) Successful in 2m9s
CI/CD Pipeline / Lint and Format (push) Failing after 35s
CI/CD Pipeline / Terraform Validation (push) Failing after 19s
CI/CD Pipeline / Kubernetes Validation (push) Successful in 22s
Validation / validate-genesis (push) Successful in 25s
Validation / validate-terraform (push) Failing after 22s
Validation / validate-kubernetes (push) Failing after 9s
Validation / validate-smart-contracts (push) Failing after 7s
Validation / validate-security (push) Failing after 1m7s
Validation / validate-documentation (push) Failing after 14s
Verify Deployment / Verify Deployment (push) Failing after 56s
92 lines
4.4 KiB
Markdown
92 lines
4.4 KiB
Markdown
# Sibling WIP archive import
|
|
|
|
## Source
|
|
- Archive: `/home/intlc/projects/archives/smom-dbis-138-sibling-wip-20260602`
|
|
- Date: 2026-06-02
|
|
- Extract: `/tmp/smom-wip-extract/` (from `untracked-files.tar.gz`)
|
|
- Patch reference: `/home/intlc/projects/archives/smom-dbis-138-sibling-wip-20260602/git-diff.patch`
|
|
|
|
## Files imported (40)
|
|
```
|
|
contracts/reserve/ChainlinkKeeperCompatible.sol
|
|
contracts/reserve/GelatoKeeperCompatible.sol
|
|
docker/Dockerfile.keeper
|
|
docker/docker-compose.keeper.yml
|
|
docs/ccip/archive-import/API_REFERENCE.md
|
|
docs/ccip/archive-import/CHAIN_SELECTOR_CALCULATION.md
|
|
docs/ccip/archive-import/DEPLOYMENT_CHECKLIST.md
|
|
docs/ccip/archive-import/DEPLOYMENT_GUIDE_CHAIN138.md
|
|
docs/ccip/archive-import/IMPLEMENTATION_SUMMARY.md
|
|
docs/ccip/archive-import/README.md
|
|
docs/ccip/archive-import/README_KEEPER.md
|
|
docs/ccip/archive-import/TESTING_GUIDE.md
|
|
docs/ccip/archive-import/developer-guides/CCIP_INTEGRATION_GUIDE.md
|
|
docs/ccip/archive-import/docs/AWS_DEPLOYMENT_GUIDE.md
|
|
docs/ccip/archive-import/docs/CCIP_CHAIN138_QUICK_REFERENCE.md
|
|
docs/ccip/archive-import/docs/CCIP_CHAIN138_REVIEW.md
|
|
docs/ccip/archive-import/docs/ETH_WETH_CHAINLINK_GUIDE.md
|
|
docs/ccip/archive-import/docs/integration/KEEPER_DEPLOYMENT_COMPLETE.md
|
|
docs/ccip/archive-import/docs/integration/KEEPER_INTEGRATION_COMPLETE.md
|
|
docs/ccip/archive-import/docs/operations/ADMIN_KEY_MANAGEMENT.md
|
|
docs/ccip/archive-import/operations/CCIP_MONITORING.md
|
|
docs/ccip/archive-import/operations/CCIP_RUNBOOKS.md
|
|
docs/ccip/archive-import/security/CCIP_SECURITY.md
|
|
docs/ccip/archive-import/user-guides/CCIP_BRIDGE_USER_GUIDE.md
|
|
script/DeployCCIPLoggerChain138.s.sol
|
|
script/DeployGovernanceToken.s.sol
|
|
script/DeployUSDC.s.sol
|
|
script/DeployUSDT.s.sol
|
|
script/helpers/Roles.sol
|
|
script/reserve/DeployChainlinkKeeper.s.sol
|
|
script/reserve/DeployGelatoKeeper.s.sol
|
|
scripts/ccip/calculate-chain-selector.sh
|
|
scripts/deployment/configure-ccip-router.sh
|
|
scripts/deployment/deploy-ccip-chain138-complete.sh
|
|
scripts/deployment/verify-ccip-deployment.sh
|
|
scripts/reserve/chainlink-keeper-setup.js
|
|
scripts/reserve/deploy-all.sh
|
|
scripts/reserve/gelato-keeper-setup.js
|
|
scripts/reserve/monitor-keeper.js
|
|
systemd/price-feed-keeper.service
|
|
```
|
|
|
|
## Files skipped (policy)
|
|
- `contracts/compliance/*`, CompliantUSDC/USDT ? canonical compliance superseded
|
|
- `config/*.toml`, `genesis.json`, `static-nodes.json` ? config drift; not merged
|
|
- Any path already present in canonical (copy-if-missing only)
|
|
- Canonical pre-existing dirty/working-tree changes ? not part of this commit
|
|
|
|
## Manual follow-ups
|
|
- Review `git-diff.patch` hunks for CCIPSender, reserve contracts, and `package.json`
|
|
- Reconcile keeper/reserve wiring with canonical deploy scripts
|
|
- Prefer current ops docs: [docs/ccip-integration/](../ccip-integration/) and runbooks
|
|
|
|
## Archive docs
|
|
Imported CCIP and keeper documentation was consolidated into [docs/ccip-integration/](../ccip-integration/) on **2026-06-02**. [docs/ccip/archive-import/](../ccip/archive-import/) is a redirect stub only.
|
|
|
|
### Consolidation (2026-06-02)
|
|
- Chain 138 guides → `docs/ccip-integration/chain138/`
|
|
- Reference material → `docs/ccip-integration/reference/`
|
|
- Ops supplements → `docs/ccip-integration/operations/`
|
|
|
|
## Manual merge completion (2026-06-02)
|
|
|
|
| Path | Result |
|
|
|------|--------|
|
|
| `docs/WETH_CREATE2_DEPLOYMENT.md` | Applied from archive patch |
|
|
| `script/reserve/DeployKeeper.s.sol` | Applied from archive patch |
|
|
| `test/emoney/unit/*.t.sol` | Restored from `.bak` (canonical had archived tests) |
|
|
| `contracts/ccip/CCIPSender.sol` | **Skipped** — canonical uses `safeIncreaseAllowance` (newer than archive `approve`) |
|
|
| `contracts/governance/{MultiSig,Voting}.sol` | **Skipped** — `Ownable(msg.sender)` already in canonical |
|
|
| `contracts/reserve/{MockPriceFeed,OraclePriceFeed,PriceFeedKeeper,ReserveTokenIntegration}.sol` | **Skipped** — canonical already includes archive fixes |
|
|
| `package.json` | **Merged** — keeper npm scripts added; full Hardhat/CCIP scripts preserved (archive would have replaced entire file) |
|
|
| Config TOML / genesis / static-nodes | **Skipped** — policy: no config drift |
|
|
|
|
Archive patch reference remains at `~/projects/archives/smom-dbis-138-sibling-wip-20260602/git-diff.patch`.
|
|
|
|
## Keeper wiring verification (2026-06-02)
|
|
|
|
- `DRY_RUN=1 bash scripts/reserve/deploy-all.sh` from repo root: **passed**
|
|
- `PRICE_FEED_KEEPER_ADDRESS`: `0xD3AD6831aacB5386B8A25BB8D8176a6C8a026f04`
|
|
- Manual follow-up **keeper/reserve wiring** marked complete; see `docs/integration/ORACLE_AND_KEEPER_CHAIN138.md`
|