Skip to content

Commit d5bd531

Browse files
committed
save
1 parent 13baaa9 commit d5bd531

File tree

4 files changed

+304
-198
lines changed

4 files changed

+304
-198
lines changed

Web3/Assets/EasyEthereum/Scripts/Contracts/ERC20.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ public async Task<bool> Load() {
2525
}
2626

2727
public async Task<BigInteger> GetTotalSupply() {
28-
var _out = await CallFunction("totalSupply()", new string[]{"int"});
28+
var _out = await CallFunction("totalSupply()", new string[]{"uint"});
2929
TotalSupply = (BigInteger)_out[0];
3030
return TotalSupply;
3131
}
3232

3333
public async Task<BigInteger> GetDecimals() {
34-
var _out = await CallFunction("decimals()", new string[]{"int"});
34+
var _out = await CallFunction("decimals()", new string[]{"uint"});
3535
Decimals = (BigInteger)_out[0];
3636
return Decimals;
3737
}
@@ -55,12 +55,12 @@ public async Task<string> GetOwner() {
5555
}
5656

5757
public async Task<BigInteger> GetBalanceOf(string _addr) {
58-
var _out = await CallFunction("balanceOf(address)", new string[]{"int"}, new string[]{_addr});
58+
var _out = await CallFunction("balanceOf(address)", new string[]{"uint"}, new string[]{_addr});
5959
return (BigInteger)_out[0];
6060
}
6161

6262
public async Task<BigInteger> GetAllowance(string _owner, string _spender) {
63-
var _out = await CallFunction("allowance(address,address)", new string[]{"int"}, new string[]{_owner,_spender});
63+
var _out = await CallFunction("allowance(address,address)", new string[]{"uint"}, new string[]{_owner,_spender});
6464
return (BigInteger)_out[0];
6565
}
6666
}

Web3/Assets/EasyEthereum/Scripts/EasyWeb3Controller.cs

Lines changed: 34 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ private async void Load() {
6868
// Debug.Log(_out[0]);
6969

7070
// Debug.Log("TEST: getUint256()");
71-
// var _out = await _token.CallFunction("getUint256()", new string[]{"uint256"});
71+
// var _out = await _token.CallFunction("getUint256()", new string[]{"uint"});
7272
// Debug.Log("returned: "+_out[0]);
7373

7474
// Debug.Log("TEST: getUint128()");
@@ -96,26 +96,43 @@ private async void Load() {
9696
// Debug.Log("returned: "+_out[0]);
9797

9898
// Debug.Log("TEST: getDataStruct()");
99-
// var _out = await _token.CallFunction("getDataStruct()", new string[]{"uint256","bool","address","string"});
100-
// Debug.Log("returned: "+_out[0]+" | "+_out[1]+" | "+_out[2]+" | "+_out[3]);
99+
// var _out = await _token.CallFunction("getDataStruct()", new string[]{"struct(uint,string,bool,address)"});
100+
// foreach(object _o in _out) {
101+
// Debug.Log(_o);
102+
// }
101103

102104
// Debug.Log("TEST: getPrimitiveMultiReturnData()");
103-
// var _out = await _token.CallFunction("getPrimitiveMultiReturnData()", new string[]{"uint256","string","bool","address"});
105+
// var _out = await _token.CallFunction("getPrimitiveMultiReturnData()", new string[]{"uint","string","bool","address"});
104106
// Debug.Log("returned length: "+_out.Count);
105-
// Debug.Log(_out[0]);
106-
// Debug.Log(_out[1]);
107-
// Debug.Log(_out[2]);
108-
// Debug.Log(_out[3]);
109-
110-
Debug.Log("TEST: getStructMultiReturnData()");
111-
var _out = await _token.CallFunction("getStructMultiReturnData()", new string[]{"uint256","string","bool","address","struct","uint256","string","bool","address"});
112-
foreach(object _o in _out) {
113-
Debug.Log(_o);
107+
// foreach(object _o in _out) {
108+
// Debug.Log(_o);
109+
// }
110+
111+
// Debug.Log("TEST: getStructMultiReturnData()");
112+
// var _out = await _token.CallFunction("getStructMultiReturnData()", new string[]{"uint","string","bool","address","struct(uint,string,bool,address)"});
113+
// foreach(object _o in _out) {
114+
// Debug.Log(_o);
115+
// }
116+
117+
// Debug.Log("TEST: getStructArr()");
118+
// var _out = await _token.CallFunction("getStructArr(DataStruct[] memory _arr)", new string[]{"struct[](uint,string,bool,address)"}, new string[]{});
119+
// foreach(object _o in _out) {
120+
// Debug.Log(_o);
121+
// }
122+
123+
// Debug.Log("TEST: getUintArr()");
124+
// var _out = await _token.CallFunction("getUintArr(uint256[])", new string[]{"uint[]"}, new string[]{"uint[](12415,23431,3555523)"});
125+
// BigInteger[] _intarr = (BigInteger[])_out[0];
126+
// foreach(BigInteger _int in _intarr) {
127+
// Debug.Log(_int);
128+
// }
129+
130+
Debug.Log("TEST: getStrArr()");
131+
var _out = await _token.CallFunction("getStrArr(string[])", new string[]{"string[]"}, new string[]{"string[](abcqest,123,341agf3)"});
132+
BigInteger[] _strarr = (BigInteger[])_out[0];
133+
foreach(BigInteger _s in _strarr) {
134+
Debug.Log(_s);
114135
}
115-
116-
// Debug.Log((new HexBigInteger("0x0000000000000000000000000000000000000000000000000000000000000060")).Value);
117-
// string _data = "0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000000464617665000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003";
118-
// Debug.Log(_data.Substring(192));
119136
}
120137

121138
private async void GetChainId() {

0 commit comments

Comments
 (0)