Merge pull request #2636 from OffchainLabs/remove-ipfs-support

[Config Change] Remove IPFS support
OffchainLabs · Oct 9, 2024 · a48e7d9 · a48e7d9
2 parents 9eee233 + 1166ccd
commit a48e7d9
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 526 deletions.
diff --git a/cmd/conf/chain.go b/cmd/conf/chain.go
@@ -52,23 +52,19 @@ func (c *ParentChainConfig) Validate() error {
 }
 
 type L2Config struct {
-	ID                   uint64                   `koanf:"id"`
-	Name                 string                   `koanf:"name"`
-	InfoFiles            []string                 `koanf:"info-files"`
-	InfoJson             string                   `koanf:"info-json"`
-	DevWallet            genericconf.WalletConfig `koanf:"dev-wallet"`
-	InfoIpfsUrl          string                   `koanf:"info-ipfs-url"`
-	InfoIpfsDownloadPath string                   `koanf:"info-ipfs-download-path"`
+	ID        uint64                   `koanf:"id"`
+	Name      string                   `koanf:"name"`
+	InfoFiles []string                 `koanf:"info-files"`
+	InfoJson  string                   `koanf:"info-json"`
+	DevWallet genericconf.WalletConfig `koanf:"dev-wallet"`
 }
 
 var L2ConfigDefault = L2Config{
-	ID:                   0,
-	Name:                 "",
-	InfoFiles:            []string{}, // Default file used is chaininfo/arbitrum_chain_info.json, stored in DefaultChainInfo in chain_info.go
-	InfoJson:             "",
-	DevWallet:            genericconf.WalletConfigDefault,
-	InfoIpfsUrl:          "",
-	InfoIpfsDownloadPath: "/tmp/",
+	ID:        0,
+	Name:      "",
+	InfoFiles: []string{}, // Default file used is chaininfo/arbitrum_chain_info.json, stored in DefaultChainInfo in chain_info.go
+	InfoJson:  "",
+	DevWallet: genericconf.WalletConfigDefault,
 }
 
 func L2ConfigAddOptions(prefix string, f *flag.FlagSet) {
@@ -79,9 +75,6 @@ func L2ConfigAddOptions(prefix string, f *flag.FlagSet) {
 
 	// Dev wallet does not exist unless specified
 	genericconf.WalletConfigAddOptions(prefix+".dev-wallet", f, "")
-	f.String(prefix+".info-ipfs-url", L2ConfigDefault.InfoIpfsUrl, "url to download chain info file")
-	f.String(prefix+".info-ipfs-download-path", L2ConfigDefault.InfoIpfsDownloadPath, "path to save temp downloaded file")
-
 }
 
 func (c *L2Config) ResolveDirectoryNames(chain string) {

diff --git a/cmd/ipfshelper/ipfshelper.bkup_go b/cmd/ipfshelper/ipfshelper.bkup_go
diff --git a/cmd/ipfshelper/ipfshelper_stub.go b/cmd/ipfshelper/ipfshelper_stub.go