diff --git a/chain/abi/FileMeta.go b/chain/abi/FileMeta.go index 204d288bd..2b5cbc4aa 100644 --- a/chain/abi/FileMeta.go +++ b/chain/abi/FileMeta.go @@ -41,7 +41,7 @@ type FileMetaFileMetaData struct { // FileMetaMetaData contains all meta data concerning the FileMeta contract. var FileMetaMetaData = &bind.MetaData{ - ABI: "[{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"previousAdmin\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"newAdmin\",\"type\":\"address\"}],\"name\":\"AdminChanged\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"beacon\",\"type\":\"address\"}],\"name\":\"BeaconUpgraded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"version\",\"type\":\"uint8\"}],\"name\":\"Initialized\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"implementation\",\"type\":\"address\"}],\"name\":\"Upgraded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"ownerPeerId\",\"type\":\"string\"},{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"fileName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"fileExt\",\"type\":\"string\"},{\"internalType\":\"bool\",\"name\":\"isDir\",\"type\":\"bool\"},{\"internalType\":\"uint256\",\"name\":\"fileSize\",\"type\":\"uint256\"}],\"indexed\":false,\"internalType\":\"structFileMeta.FileMetaData\",\"name\":\"metaData\",\"type\":\"tuple\"}],\"name\":\"eventAddFileMeta\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"}],\"name\":\"eventDeleteFileMeta\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"ownerPeerId\",\"type\":\"string\"},{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"fileName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"fileExt\",\"type\":\"string\"},{\"internalType\":\"bool\",\"name\":\"isDir\",\"type\":\"bool\"},{\"internalType\":\"uint256\",\"name\":\"fileSize\",\"type\":\"uint256\"}],\"internalType\":\"structFileMeta.FileMetaData\",\"name\":\"metaData\",\"type\":\"tuple\"}],\"name\":\"AddFileMeta\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"}],\"name\":\"DeleteFileMeta\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"}],\"name\":\"GetFileMeta\",\"outputs\":[{\"components\":[{\"internalType\":\"string\",\"name\":\"ownerPeerId\",\"type\":\"string\"},{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"fileName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"fileExt\",\"type\":\"string\"},{\"internalType\":\"bool\",\"name\":\"isDir\",\"type\":\"bool\"},{\"internalType\":\"uint256\",\"name\":\"fileSize\",\"type\":\"uint256\"}],\"internalType\":\"structFileMeta.FileMetaData\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getImplementation\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"initialize\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"proxiableUUID\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newImplementation\",\"type\":\"address\"}],\"name\":\"upgradeTo\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newImplementation\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"upgradeToAndCall\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"}]", + ABI: "[{\"inputs\":[{\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"ownerPeerId\",\"type\":\"string\"},{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"fileName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"fileExt\",\"type\":\"string\"},{\"internalType\":\"bool\",\"name\":\"isDir\",\"type\":\"bool\"},{\"internalType\":\"uint256\",\"name\":\"fileSize\",\"type\":\"uint256\"}],\"internalType\":\"structFileMeta.FileMetaData\",\"name\":\"metaData\",\"type\":\"tuple\"}],\"name\":\"AddFileMeta\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"previousAdmin\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"address\",\"name\":\"newAdmin\",\"type\":\"address\"}],\"name\":\"AdminChanged\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"beacon\",\"type\":\"address\"}],\"name\":\"BeaconUpgraded\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"}],\"name\":\"DeleteFileMeta\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"initialize\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint8\",\"name\":\"version\",\"type\":\"uint8\"}],\"name\":\"Initialized\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"renounceOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"implementation\",\"type\":\"address\"}],\"name\":\"Upgraded\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"},{\"components\":[{\"internalType\":\"string\",\"name\":\"ownerPeerId\",\"type\":\"string\"},{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"fileName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"fileExt\",\"type\":\"string\"},{\"internalType\":\"bool\",\"name\":\"isDir\",\"type\":\"bool\"},{\"internalType\":\"uint256\",\"name\":\"fileSize\",\"type\":\"uint256\"}],\"indexed\":false,\"internalType\":\"structFileMeta.FileMetaData\",\"name\":\"metaData\",\"type\":\"tuple\"}],\"name\":\"eventAddFileMeta\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"}],\"name\":\"eventDeleteFileMeta\",\"type\":\"event\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newImplementation\",\"type\":\"address\"}],\"name\":\"upgradeTo\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"newImplementation\",\"type\":\"address\"},{\"internalType\":\"bytes\",\"name\":\"data\",\"type\":\"bytes\"}],\"name\":\"upgradeToAndCall\",\"outputs\":[],\"stateMutability\":\"payable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"cid\",\"type\":\"string\"}],\"name\":\"GetFileMeta\",\"outputs\":[{\"components\":[{\"internalType\":\"string\",\"name\":\"ownerPeerId\",\"type\":\"string\"},{\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"fileName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"fileExt\",\"type\":\"string\"},{\"internalType\":\"bool\",\"name\":\"isDir\",\"type\":\"bool\"},{\"internalType\":\"uint256\",\"name\":\"fileSize\",\"type\":\"uint256\"}],\"internalType\":\"structFileMeta.FileMetaData\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getImplementation\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"proxiableUUID\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"view\",\"type\":\"function\"}]", } // FileMetaABI is the input ABI used to generate the binding from. @@ -1240,22 +1240,17 @@ func (it *FileMetaEventAddFileMetaIterator) Close() error { // FileMetaEventAddFileMeta represents a EventAddFileMeta event raised by the FileMeta contract. type FileMetaEventAddFileMeta struct { - Cid common.Hash + Cid string MetaData FileMetaFileMetaData Raw types.Log // Blockchain specific contextual infos } // FilterEventAddFileMeta is a free log retrieval operation binding the contract event 0x5858f0194a72c3a15e5d5f94dbbb35a90af87476e958f990a6fc31db87a16b95. // -// Solidity: event eventAddFileMeta(string indexed cid, (string,address,string,string,bool,uint256) metaData) -func (_FileMeta *FileMetaFilterer) FilterEventAddFileMeta(opts *bind.FilterOpts, cid []string) (*FileMetaEventAddFileMetaIterator, error) { +// Solidity: event eventAddFileMeta(string cid, (string,address,string,string,bool,uint256) metaData) +func (_FileMeta *FileMetaFilterer) FilterEventAddFileMeta(opts *bind.FilterOpts) (*FileMetaEventAddFileMetaIterator, error) { - var cidRule []interface{} - for _, cidItem := range cid { - cidRule = append(cidRule, cidItem) - } - - logs, sub, err := _FileMeta.contract.FilterLogs(opts, "eventAddFileMeta", cidRule) + logs, sub, err := _FileMeta.contract.FilterLogs(opts, "eventAddFileMeta") if err != nil { return nil, err } @@ -1264,15 +1259,10 @@ func (_FileMeta *FileMetaFilterer) FilterEventAddFileMeta(opts *bind.FilterOpts, // WatchEventAddFileMeta is a free log subscription operation binding the contract event 0x5858f0194a72c3a15e5d5f94dbbb35a90af87476e958f990a6fc31db87a16b95. // -// Solidity: event eventAddFileMeta(string indexed cid, (string,address,string,string,bool,uint256) metaData) -func (_FileMeta *FileMetaFilterer) WatchEventAddFileMeta(opts *bind.WatchOpts, sink chan<- *FileMetaEventAddFileMeta, cid []string) (event.Subscription, error) { - - var cidRule []interface{} - for _, cidItem := range cid { - cidRule = append(cidRule, cidItem) - } +// Solidity: event eventAddFileMeta(string cid, (string,address,string,string,bool,uint256) metaData) +func (_FileMeta *FileMetaFilterer) WatchEventAddFileMeta(opts *bind.WatchOpts, sink chan<- *FileMetaEventAddFileMeta) (event.Subscription, error) { - logs, sub, err := _FileMeta.contract.WatchLogs(opts, "eventAddFileMeta", cidRule) + logs, sub, err := _FileMeta.contract.WatchLogs(opts, "eventAddFileMeta") if err != nil { return nil, err } @@ -1306,7 +1296,7 @@ func (_FileMeta *FileMetaFilterer) WatchEventAddFileMeta(opts *bind.WatchOpts, s // ParseEventAddFileMeta is a log parse operation binding the contract event 0x5858f0194a72c3a15e5d5f94dbbb35a90af87476e958f990a6fc31db87a16b95. // -// Solidity: event eventAddFileMeta(string indexed cid, (string,address,string,string,bool,uint256) metaData) +// Solidity: event eventAddFileMeta(string cid, (string,address,string,string,bool,uint256) metaData) func (_FileMeta *FileMetaFilterer) ParseEventAddFileMeta(log types.Log) (*FileMetaEventAddFileMeta, error) { event := new(FileMetaEventAddFileMeta) if err := _FileMeta.contract.UnpackLog(event, "eventAddFileMeta", log); err != nil { @@ -1385,21 +1375,16 @@ func (it *FileMetaEventDeleteFileMetaIterator) Close() error { // FileMetaEventDeleteFileMeta represents a EventDeleteFileMeta event raised by the FileMeta contract. type FileMetaEventDeleteFileMeta struct { - Cid common.Hash + Cid string Raw types.Log // Blockchain specific contextual infos } // FilterEventDeleteFileMeta is a free log retrieval operation binding the contract event 0x75ab1296ebe483fe9506fccbfe8a4743edf9ef6cf8802c2c28c652dfa948e412. // -// Solidity: event eventDeleteFileMeta(string indexed cid) -func (_FileMeta *FileMetaFilterer) FilterEventDeleteFileMeta(opts *bind.FilterOpts, cid []string) (*FileMetaEventDeleteFileMetaIterator, error) { +// Solidity: event eventDeleteFileMeta(string cid) +func (_FileMeta *FileMetaFilterer) FilterEventDeleteFileMeta(opts *bind.FilterOpts) (*FileMetaEventDeleteFileMetaIterator, error) { - var cidRule []interface{} - for _, cidItem := range cid { - cidRule = append(cidRule, cidItem) - } - - logs, sub, err := _FileMeta.contract.FilterLogs(opts, "eventDeleteFileMeta", cidRule) + logs, sub, err := _FileMeta.contract.FilterLogs(opts, "eventDeleteFileMeta") if err != nil { return nil, err } @@ -1408,15 +1393,10 @@ func (_FileMeta *FileMetaFilterer) FilterEventDeleteFileMeta(opts *bind.FilterOp // WatchEventDeleteFileMeta is a free log subscription operation binding the contract event 0x75ab1296ebe483fe9506fccbfe8a4743edf9ef6cf8802c2c28c652dfa948e412. // -// Solidity: event eventDeleteFileMeta(string indexed cid) -func (_FileMeta *FileMetaFilterer) WatchEventDeleteFileMeta(opts *bind.WatchOpts, sink chan<- *FileMetaEventDeleteFileMeta, cid []string) (event.Subscription, error) { - - var cidRule []interface{} - for _, cidItem := range cid { - cidRule = append(cidRule, cidItem) - } +// Solidity: event eventDeleteFileMeta(string cid) +func (_FileMeta *FileMetaFilterer) WatchEventDeleteFileMeta(opts *bind.WatchOpts, sink chan<- *FileMetaEventDeleteFileMeta) (event.Subscription, error) { - logs, sub, err := _FileMeta.contract.WatchLogs(opts, "eventDeleteFileMeta", cidRule) + logs, sub, err := _FileMeta.contract.WatchLogs(opts, "eventDeleteFileMeta") if err != nil { return nil, err } @@ -1450,7 +1430,7 @@ func (_FileMeta *FileMetaFilterer) WatchEventDeleteFileMeta(opts *bind.WatchOpts // ParseEventDeleteFileMeta is a log parse operation binding the contract event 0x75ab1296ebe483fe9506fccbfe8a4743edf9ef6cf8802c2c28c652dfa948e412. // -// Solidity: event eventDeleteFileMeta(string indexed cid) +// Solidity: event eventDeleteFileMeta(string cid) func (_FileMeta *FileMetaFilterer) ParseEventDeleteFileMeta(log types.Log) (*FileMetaEventDeleteFileMeta, error) { event := new(FileMetaEventDeleteFileMeta) if err := _FileMeta.contract.UnpackLog(event, "eventDeleteFileMeta", log); err != nil { diff --git a/chain/config/config.go b/chain/config/config.go index 2a7bf90a8..5293919f4 100644 --- a/chain/config/config.go +++ b/chain/config/config.go @@ -37,7 +37,7 @@ var ( //bttcTestVaultLogicAddress = common.HexToAddress("0x73bcbE03999913dB7229FD5dC485cf23247c58B5") // https://testnet.bttcscan.com/address/0x67F0366c4c0c83F55D4759D301BEe051EF01E350 bttcTestMutiVaultLogicAddress = common.HexToAddress("0x67F0366c4c0c83F55D4759D301BEe051EF01E350") // https://testnet.bttcscan.com/address/0x67F0366c4c0c83F55D4759D301BEe051EF01E350 bttcTestStatusAddress = common.HexToAddress("0x38d1fF2C2e9744273E4531FA4608eB6432c1F26A") - bttcTestFileMetaAddress = common.HexToAddress("0x094fF75b4760f867d6211E0104f805a59809c369") + bttcTestFileMetaAddress = common.HexToAddress("0xB192bb91c143C196EF3c659923Ef34026B170997") bttcFactoryAddressV1 = common.HexToAddress("0x9AF4bEc1A30BeC47756Ecef4cf43B91592121bC9") bttcFactoryAddress = common.HexToAddress("0x763d7858287B9a33F4bE5bb3df0241dACc59BCc7") // https://bttcscan.com/address/0x763d7858287B9a33F4bE5bb3df0241dACc59BCc7 @@ -48,7 +48,7 @@ var ( //bttcVaultLogicAddress = common.HexToAddress("0x11a91B7270ea000768F7A2C543547e832b5cb031") // https://bttcscan.com/address/0x11a91B7270ea000768F7A2C543547e832b5cb031 bttcMutiVaultLogicAddress = common.HexToAddress("0x5c67bED46336A59252b73a0fA22B9de1cffb172e") bttcStatusAddress = common.HexToAddress("0x6DBAd4Bd16C15AE6dDEaA640626e5A3E151F02fC") - bttcFileMetaAddress = common.HexToAddress("0xa8d39B27Ebae53c4391B973Afa2f8e704f6e374C") + bttcFileMetaAddress = common.HexToAddress("0xe74117DC4A3457Eb32436F8F3De10701a3C4F6d7") // deploy gas ethDeploymentGas = "10"