Skip to content

Commit a7fef3d

Browse files
fadeevfadeev
authored
chore: switch to context sender/senderEVM (#257)
1 parent b3876a2 commit a7fef3d

File tree

10 files changed

+3636
-124
lines changed

10 files changed

+3636
-124
lines changed

‎examples/call/package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
"@solana/spl-token": "^0.4.13",
6060
"@solana/web3.js": "^1.95.8",
6161
"@zetachain/networks": "13.0.0-rc1",
62-
"@zetachain/protocol-contracts": "12.0.0-rc1",
63-
"@zetachain/protocol-contracts-solana": "2.0.0-rc1"
62+
"@zetachain/protocol-contracts": "13.0.0",
63+
"@zetachain/protocol-contracts-solana": "2.0.0-rc1",
64+
"zetachain": "^3.0.0"
6465
}
6566
}

‎examples/call/scripts/localnet.sh

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ set -e
44
set -x
55
set -o pipefail
66

7-
if [ "$1" = "start" ]; then npx hardhat localnet & sleep 20; fi
7+
yarn zetachain localnet start --skip sui ton solana --exit-on-error &
8+
9+
while [ ! -f "localnet.json" ]; do sleep 1; done
810

9-
echo -e "\n🚀 Compiling contracts..."
1011
npx hardhat compile --force --quiet
1112

1213
ZRC20_ETHEREUM=$(jq -r '.addresses[] | select(.type=="ZRC-20 ETH on 5") | .address' localnet.json)
@@ -35,7 +36,7 @@ npx hardhat connected-deposit \
3536
--abort-address "$CONTRACT_ZETACHAIN" \
3637
--amount 1
3738

38-
npx hardhat localnet-check
39+
yarn zetachain localnet check
3940

4041
npx hardhat connected-deposit \
4142
--contract "$CONTRACT_ETHEREUM" \
@@ -45,7 +46,7 @@ npx hardhat connected-deposit \
4546
--abort-address "$CONTRACT_ZETACHAIN" \
4647
--amount 1
4748

48-
npx hardhat localnet-check
49+
yarn zetachain localnet check
4950

5051
npx hardhat connected-call \
5152
--contract "$CONTRACT_ETHEREUM" \
@@ -54,7 +55,7 @@ npx hardhat connected-call \
5455
--abort-address "$CONTRACT_ZETACHAIN" \
5556
--types '["string"]' alice
5657

57-
npx hardhat localnet-check
58+
yarn zetachain localnet check
5859

5960
npx hardhat connected-deposit-and-call \
6061
--contract "$CONTRACT_ETHEREUM" \
@@ -64,7 +65,7 @@ npx hardhat connected-deposit-and-call \
6465
--abort-address "$CONTRACT_ZETACHAIN" \
6566
--types '["string"]' alice
6667

67-
npx hardhat localnet-check
68+
yarn zetachain localnet check
6869

6970
npx hardhat connected-deposit-and-call \
7071
--contract "$CONTRACT_ETHEREUM" \
@@ -75,7 +76,7 @@ npx hardhat connected-deposit-and-call \
7576
--abort-address "$CONTRACT_ZETACHAIN" \
7677
--types '["string"]' alice
7778

78-
npx hardhat localnet-check
79+
yarn zetachain localnet check
7980

8081
npx hardhat universal-withdraw \
8182
--contract "$CONTRACT_ZETACHAIN" \
@@ -85,7 +86,7 @@ npx hardhat universal-withdraw \
8586
--abort-address "$CONTRACT_ZETACHAIN" \
8687
--amount 1
8788

88-
npx hardhat localnet-check
89+
yarn zetachain localnet check
8990

9091
npx hardhat universal-call \
9192
--contract "$CONTRACT_ZETACHAIN" \
@@ -96,7 +97,7 @@ npx hardhat universal-call \
9697
--abort-address "$CONTRACT_ZETACHAIN" \
9798
--types '["string"]' alice
9899

99-
npx hardhat localnet-check
100+
yarn zetachain localnet check
100101

101102
npx hardhat universal-withdraw-and-call \
102103
--contract "$CONTRACT_ZETACHAIN" \
@@ -109,7 +110,7 @@ npx hardhat universal-withdraw-and-call \
109110
--abort-address "$CONTRACT_ZETACHAIN" \
110111
--types '["string"]' hello
111112

112-
npx hardhat localnet-check
113+
yarn zetachain localnet check
113114

114115
npx hardhat universal-withdraw-and-call \
115116
--contract "$CONTRACT_ZETACHAIN" \
@@ -120,7 +121,7 @@ npx hardhat universal-withdraw-and-call \
120121
--abort-address "$CONTRACT_ZETACHAIN" \
121122
--types '["string"]' hello
122123

123-
npx hardhat localnet-check
124+
yarn zetachain localnet check
124125

125126
# Testing toolkit methods
126127

@@ -130,7 +131,7 @@ npx hardhat evm-deposit \
130131
--network localhost \
131132
--amount 1
132133

133-
npx hardhat localnet-check
134+
yarn zetachain localnet check
134135

135136
npx hardhat evm-deposit \
136137
--receiver "$CONTRACT_ZETACHAIN" \
@@ -139,15 +140,15 @@ npx hardhat evm-deposit \
139140
--erc20 "$ERC20_ETHEREUM" \
140141
--amount 1
141142

142-
npx hardhat localnet-check
143+
yarn zetachain localnet check
143144

144145
npx hardhat evm-call \
145146
--receiver "$CONTRACT_ZETACHAIN" \
146147
--gateway-evm "$GATEWAY_ETHEREUM" \
147148
--network localhost \
148149
--types '["string"]' alice
149150

150-
npx hardhat localnet-check
151+
yarn zetachain localnet check
151152

152153
npx hardhat evm-deposit-and-call \
153154
--receiver "$CONTRACT_ZETACHAIN" \
@@ -156,7 +157,7 @@ npx hardhat evm-deposit-and-call \
156157
--amount 1 \
157158
--types '["string"]' alice
158159

159-
npx hardhat localnet-check
160+
yarn zetachain localnet check
160161

161162
npx hardhat evm-deposit-and-call \
162163
--receiver "$CONTRACT_ZETACHAIN" \
@@ -166,7 +167,7 @@ npx hardhat evm-deposit-and-call \
166167
--erc20 "$ERC20_ETHEREUM" \
167168
--types '["string"]' alice
168169

169-
npx hardhat localnet-check
170+
yarn zetachain localnet check
170171

171172
npx hardhat zetachain-withdraw \
172173
--receiver "$CONTRACT_ETHEREUM" \
@@ -175,16 +176,16 @@ npx hardhat zetachain-withdraw \
175176
--network localhost \
176177
--amount 1
177178

178-
npx hardhat localnet-check
179+
yarn zetachain localnet check
179180

180-
npx hardhat zetachain-withdraw \
181-
--receiver "DrexsvCMH9WWjgnjVbx1iFf3YZcKadupFmxnZLfSyotd" \
182-
--gateway-zeta-chain "$GATEWAY_ZETACHAIN" \
183-
--zrc20 "$ZRC20_SOL" \
184-
--network localhost \
185-
--amount 1
181+
# npx hardhat zetachain-withdraw \
182+
# --receiver "DrexsvCMH9WWjgnjVbx1iFf3YZcKadupFmxnZLfSyotd" \
183+
# --gateway-zeta-chain "$GATEWAY_ZETACHAIN" \
184+
# --zrc20 "$ZRC20_SOL" \
185+
# --network localhost \
186+
# --amount 1
186187

187-
npx hardhat localnet-check
188+
# yarn zetachain localnet check
188189

189190
npx hardhat zetachain-call \
190191
--receiver "$CONTRACT_ETHEREUM" \
@@ -194,7 +195,7 @@ npx hardhat zetachain-call \
194195
--network localhost \
195196
--types '["string"]' alice
196197

197-
npx hardhat localnet-check
198+
yarn zetachain localnet check
198199

199200
npx hardhat zetachain-withdraw-and-call \
200201
--receiver "$CONTRACT_ETHEREUM" \
@@ -206,7 +207,7 @@ npx hardhat zetachain-withdraw-and-call \
206207
--call-options-is-arbitrary-call \
207208
--types '["string"]' hello
208209

209-
npx hardhat localnet-check
210+
yarn zetachain localnet check
210211

211212
# ENCODED_ACCOUNTS_AND_DATA=$(npx ts-node solana/setup/encodeCallArgs.ts "sol" "$USDC_SPL")
212213
# npx hardhat zetachain-withdraw-and-call \
@@ -217,7 +218,7 @@ npx hardhat localnet-check
217218
# --network localhost \
218219
# --types '["bytes"]' $ENCODED_ACCOUNTS_AND_DATA
219220

220-
# npx hardhat localnet-check
221+
# yarn zetachain localnet check
221222

222223
# ENCODED_ACCOUNTS_AND_DATA=$(npx ts-node solana/setup/encodeCallArgs.ts "spl" "$USDC_SPL")
223224
# npx hardhat zetachain-withdraw-and-call \
@@ -228,7 +229,7 @@ npx hardhat localnet-check
228229
# --network localhost \
229230
# --types '["bytes"]' $ENCODED_ACCOUNTS_AND_DATA
230231

231-
# npx hardhat localnet-check
232+
# yarn zetachain localnet check
232233

233234
npx hardhat zetachain-withdraw-and-call \
234235
--receiver "$CONTRACT_ETHEREUM" \
@@ -238,6 +239,6 @@ npx hardhat zetachain-withdraw-and-call \
238239
--network localhost \
239240
--types '["string"]' hello
240241

241-
npx hardhat localnet-check
242+
yarn zetachain localnet check
242243

243-
if [ "$1" = "start" ]; then npx hardhat localnet-stop; fi
244+
yarn zetachain localnet stop

0 commit comments

Comments
 (0)