Skip to content
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.

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

Bit of cleanup #1215

Merged
merged 4 commits into from
Sep 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion contracts/core/wegld-swap/interaction/snippets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ALICE="~/multiversx-sdk/testwallets/latest/users/alice.pem"
BOB="~/multiversx-sdk/testwallets/latest/users/bob.pem"
ADDRESS=$(mxpy data load --key=address-testnet-egld-esdt-swap)
DEPLOY_TRANSACTION=$(mxpy data load --key=deployTransaction-testnet)
PROXY=https://testnet-gateway.elrond.com
PROXY=https://testnet-gateway.multiversx.com
CHAIN_ID=T

ESDT_SYSTEM_SC_ADDRESS=erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqzllls8a5w6u
Expand Down
2 changes: 0 additions & 2 deletions contracts/core/wegld-swap/testnet.toml

This file was deleted.

30 changes: 2 additions & 28 deletions contracts/examples/adder/README.md
Original file line number Diff line number Diff line change
@@ -1,29 +1,3 @@
# Interaction
# Adder

## On devnet

Deploy & interact with contract:

```
python3 ./interaction/playground.py --pem=./testnet/wallets/users/alice.pem --proxy=http://localhost:7950
```

Interact with existing contract:

```
python3 ./interaction/playground.py --pem=./testnet/wallets/users/alice.pem --proxy=http://localhost:7950 --contract=erd1...
```

## On testnet

Deploy & interact with contract:

```
python3 ./interaction/playground.py --pem=my.pem --proxy=https://testnet-gateway.elrond.com
```

Interact with existing contract:

```
python3 ./interaction/playground.py --pem=my.pem --proxy=https://testnet-gateway.elrond.com --contract=erd1...
```
`Adder` is a simple Smart Contract.
22 changes: 0 additions & 22 deletions contracts/examples/adder/interaction/Adder.erdjs.md

This file was deleted.

2 changes: 1 addition & 1 deletion contracts/examples/adder/interaction/testnet.snippets.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ALICE="${USERS}/alice.pem"
ADDRESS=$(mxpy data load --key=address-testnet)
DEPLOY_TRANSACTION=$(mxpy data load --key=deployTransaction-testnet)
PROXY=https://testnet-api.elrond.com
PROXY=https://testnet-api.multiversx.com

deploy() {
mxpy --verbose contract deploy --project=${PROJECT} --recall-nonce --pem=${ALICE} --gas-limit=50000000 --arguments 0 --send --outfile="deploy-testnet.interaction.json" --proxy=${PROXY} --chain=T || return
Expand Down
Empty file.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ BOB="${USERS}/bob.pem"

ADDRESS=$(mxpy data load --key=address-testnet)
DEPLOY_TRANSACTION=$(mxpy data load --key=deployTransaction-testnet)
PROXY=https://testnet-api.elrond.com
PROXY=https://testnet-api.multiversx.com

DEPLOY_GAS="80000000"
TARGET=10
Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
2 changes: 1 addition & 1 deletion contracts/examples/nft-minter/interaction/snippets.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ALICE="" # PEM path
ADDRESS=$(mxpy data load --key=address-devnet)
DEPLOY_TRANSACTION=$(mxpy data load --key=deployTransaction-devnet)
PROXY=https://devnet-gateway.elrond.com
PROXY=https://devnet-gateway.multiversx.com
CHAIN_ID=D

deploy() {
Expand Down
Empty file.
Empty file.
Empty file.
Empty file.

This file was deleted.

4 changes: 2 additions & 2 deletions contracts/examples/ping-pong-egld/interaction/snippets.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PEM_FILE="./ping-pong.pem"
PING_PONG_CONTRACT="./elrond-wasm-rs/contracts/examples/ping-pong-egld"
PING_PONG_CONTRACT="./mx-sdk-rs/contracts/examples/ping-pong-egld"

PROXY_ARGUMENT="--proxy=https://devnet-api.elrond.com"
PROXY_ARGUMENT="--proxy=https://devnet-api.multiversx.com"
CHAIN_ARGUMENT="--chain=D"

build_ping_pong() {
Expand Down
Empty file.
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ VAULT_ADDRESS_HEX="0x$(mxpy wallet bech32 --decode ${VAULT_ADDRESS_BECH32})"

ECHO_ARGS_FUNC_NAME=echo_args_async

PROXY=https://testnet-api.elrond.com
PROXY=https://testnet-api.multiversx.com
CHAIN_ID=T

deployForwarder() {
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ TOKEN_ID=""
TOKEN_ID_HEX="0x$(echo -n ${TOKEN_ID} | xxd -p -u | tr -d '\n')"
TOKEN_AMOUNT_PER_TX=100

PROXY="https://testnet-gateway.elrond.com"
PROXY="https://testnet-gateway.multiversx.com"
CHAIN_ID="T"

SC_WITH_ROLE_ADDRESS_BECH32=
Expand Down
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
6 changes: 3 additions & 3 deletions tools/mxpy-snippet-generator/src/constants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ pub const NFT_TRANSFER_FUNC_NAME: &str = "ESDTNFTTransfer";
pub const MULTI_TRANSFER_FUNC_NAME: &str = "MultiESDTNFTTransfer";

// default proxies
pub const TESTNET_PROXY: &str = "https://testnet-gateway.elrond.com";
pub const DEVNET_PROXY: &str = "https://devnet-gateway.elrond.com";
pub const MAINNET_PROXY: &str = "https://gateway.elrond.com";
pub const TESTNET_PROXY: &str = "https://testnet-gateway.multiversx.com";
pub const DEVNET_PROXY: &str = "https://devnet-gateway.multiversx.com";
pub const MAINNET_PROXY: &str = "https://gateway.multiversx.com";

// default chain IDs
pub const TESTNET_CHAIN_ID: &str = "T";
Expand Down
Loading