From 3aa1af0469a91270491b5418c566573bb56b50f6 Mon Sep 17 00:00:00 2001 From: stadolf Date: Tue, 14 May 2024 12:24:56 +0200 Subject: [PATCH] updates foundry updates ipfs peering removes legacy tx support in setup scripts Signed-off-by: stadolf --- .github/workflows/test.yml | 2 +- deploy/001-ipfs-config.sh | 2 +- docker-compose.yml | 4 ++-- setupLocal.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bb07e4dc..794c29a6 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: - name: Install Foundry uses: foundry-rs/foundry-toolchain@v1 with: - version: nightly-d369d2486f85576eec4ca41d277391dfdae21ba7 + version: nightly-a117fbfa41edbaa1618ed099d78d65727bff4790 - name: Use Node.js 18 uses: actions/setup-node@v3 diff --git a/deploy/001-ipfs-config.sh b/deploy/001-ipfs-config.sh index b15a7264..cadf1cb0 100755 --- a/deploy/001-ipfs-config.sh +++ b/deploy/001-ipfs-config.sh @@ -18,7 +18,7 @@ ipfs config --json Gateway.HTTPHeaders.Access-Control-Allow-Credentials '["true" # https://web3.storage/docs/reference/peering/ # allows us to also pull w3s / pinata content from our local machine -ipfs config --json Peering.Peers '[{"ID": "bafzbeibhqavlasjc7dvbiopygwncnrtvjd2xmryk5laib7zyjor6kf3avm","Addrs": ["/dnsaddr/elastic.dag.house"]},{"ID": "QmWaik1eJcGHq1ybTWe7sezRfqKNcDRNkeBaLnGwQJz1Cj","Addrs": ["/dnsaddr/fra1-1.hostnodes.pinata.cloud"]},{"ID": "QmNfpLrQQZr5Ns9FAJKpyzgnDL2GgC6xBug1yUZozKFgu4","Addrs": ["/dnsaddr/fra1-2.hostnodes.pinata.cloud"]},{"ID": "QmPo1ygpngghu5it8u4Mr3ym6SEU2Wp2wA66Z91Y1S1g29","Addrs": ["/dnsaddr/fra1-3.hostnodes.pinata.cloud"]},{"ID": "QmRjLSisUCHVpFa5ELVvX3qVPfdxajxWJEHs9kN3EcxAW6","Addrs": ["/dnsaddr/nyc1-1.hostnodes.pinata.cloud"]},{"ID": "QmPySsdmbczdZYBpbi2oq2WMJ8ErbfxtkG8Mo192UHkfGP","Addrs": ["/dnsaddr/nyc1-2.hostnodes.pinata.cloud"]},{"ID": "QmSarArpxemsPESa6FNkmuu9iSE1QWqPX2R3Aw6f5jq4D5","Addrs": ["/dnsaddr/nyc1-3.hostnodes.pinata.cloud"]}]' +ipfs config --json Peering.Peers '[{"ID": "bafzbeibhqavlasjc7dvbiopygwncnrtvjd2xmryk5laib7zyjor6kf3avm","Addrs": ["/dns4/elastic.dag.house/tcp/443/wss"]},{"ID": "QmWaik1eJcGHq1ybTWe7sezRfqKNcDRNkeBaLnGwQJz1Cj","Addrs": ["/dnsaddr/fra1-1.hostnodes.pinata.cloud"]},{"ID": "QmNfpLrQQZr5Ns9FAJKpyzgnDL2GgC6xBug1yUZozKFgu4","Addrs": ["/dnsaddr/fra1-2.hostnodes.pinata.cloud"]},{"ID": "QmPo1ygpngghu5it8u4Mr3ym6SEU2Wp2wA66Z91Y1S1g29","Addrs": ["/dnsaddr/fra1-3.hostnodes.pinata.cloud"]},{"ID": "QmRjLSisUCHVpFa5ELVvX3qVPfdxajxWJEHs9kN3EcxAW6","Addrs": ["/dnsaddr/nyc1-1.hostnodes.pinata.cloud"]},{"ID": "QmPySsdmbczdZYBpbi2oq2WMJ8ErbfxtkG8Mo192UHkfGP","Addrs": ["/dnsaddr/nyc1-2.hostnodes.pinata.cloud"]},{"ID": "QmSarArpxemsPESa6FNkmuu9iSE1QWqPX2R3Aw6f5jq4D5","Addrs": ["/dnsaddr/nyc1-3.hostnodes.pinata.cloud"]}]' #https://github.com/ipfs/kubo/blob/master/docs/config.md#implicit-defaults-of-gatewaypublicgateways #axios is confused with local ipfs subdomains diff --git a/docker-compose.yml b/docker-compose.yml index 3cec32ca..35937f55 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3' services: anvil: - image: ghcr.io/foundry-rs/foundry:latest + image: ghcr.io/foundry-rs/foundry:nightly-a117fbfa41edbaa1618ed099d78d65727bff4790 command: - 'anvil --host 0.0.0.0' ports: @@ -31,7 +31,7 @@ services: GRAPH_LOG: info GRAPH_ALLOW_NON_DETERMINISTIC_IPFS: 1 ipfs: - image: ipfs/kubo:v0.21.0 + image: ipfs/kubo:v0.28.0 ports: - '5001:5001' - '8080:8080' diff --git a/setupLocal.sh b/setupLocal.sh index 44fccd04..f3b1be7e 100755 --- a/setupLocal.sh +++ b/setupLocal.sh @@ -22,7 +22,7 @@ while [ "$#" -gt 0 ]; do shift done -FSC="forge script -f $RPC_URL --broadcast --legacy --revert-strings debug" +FSC="forge script -f $RPC_URL --broadcast" # Deployments $FSC script/dev/Ipnft.s.sol:DeployIpnftSuite