Skip to content

bump to web3py 6 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gerrrg merged 4 commits into from
Oct 25, 2023
Merged

bump to web3py 6 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5db25f5
bumped to web3v6
8ball030 Oct 9, 2023
ea06723
[feat] gitignore
Oct 10, 2023
7bf1b2a
update all web3py breaking changes
gerrrg Oct 21, 2023
b7097f6
add venv and dist
gerrrg Oct 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
multicaller.egg-info
build
venv
dist
10 changes: 5 additions & 5 deletions multicaller/multicaller.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def loadMultiCall(self):
abiPath = os.path.join(path);
f = pkgutil.get_data(__name__, abiPath).decode();
abi = json.loads(f);
multiCall = self.web3.eth.contract(self.web3.toChecksumAddress(multicallAddress), abi=abi);
multiCall = self.web3.eth.contract(self.web3.to_checksum_address(multicallAddress), abi=abi);
return(multiCall);

def getMultiCallAddress(self):
Expand All @@ -48,7 +48,7 @@ def getMultiCallAddress(self):
@cache
def getContract(self, address, abiString):
abi = self.stringToList(abiString);
contract = self.web3.eth.contract(self.web3.toChecksumAddress(address), abi=abi);
contract = self.web3.eth.contract(self.web3.to_checksum_address(address), abi=abi);
return(contract);

@cache
Expand All @@ -68,7 +68,7 @@ def decodeData(self, decoder, rawOutput):
if rawOutput == b'':
return None;

return(self.web3.codec.decode_abi(self.stringToList(decoder), rawOutput));
return(self.web3.codec.decode(self.stringToList(decoder), rawOutput));

def iterArgs(self, args):
isTuple = False;
Expand Down Expand Up @@ -109,9 +109,9 @@ def addCall(self, address, abi, functionName, args=None):

payload = None;
if self.allowFailure:
payload = (self.web3.toChecksumAddress(address), True, callData);
payload = (self.web3.to_checksum_address(address), True, callData);
else:
payload = (self.web3.toChecksumAddress(address), callData);
payload = (self.web3.to_checksum_address(address), callData);

self.payload.append(payload);
self.decoders.append(get_abi_output_types(fn.abi));
Expand Down
2 changes: 1 addition & 1 deletion samples/sample.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"0x263534a4fe3cb249df46810718b7b612a30ebbff"
];

balancerVault = web3.toChecksumAddress("0xba12222222228d8ba445958a75a0704d566bf2c8");
balancerVault = web3.to_checksum_address("0xba12222222228d8ba445958a75a0704d566bf2c8");

for tokenAddress in tokenAddresses:
mc.addCall(tokenAddress, erc20Abi, 'symbol');
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ classifiers =
packages = find:
include_package_data = true
install_requires =
web3==5.24.0
web3>=6.0,<=7.0