LaconicNetwork/cosmjs-util
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #474 from CosmWasm/update-erc20

Browse Source 
Update and re-enable erc20 contract
This commit is contained in:
Simon Warta
2020-10-15 11:55:08 +02:00
committed by GitHub
parent 12a36d9086 ed120b6383
commit e7b254bbd5
8 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.circleci/config.yml
+3 -3
View File
@@ -136,7 +136,7 @@ jobs:
- run:
environment:
WASMD_ENABLED: 1
# ERC20_ENABLED: 1
ERC20_ENABLED: 1
SIMAPP_ENABLED: 1
TENDERMINT_ENABLED: 1
SOCKETSERVER_ENABLED: 1
@@ -245,7 +245,7 @@ jobs:
- run:
environment:
WASMD_ENABLED: 1
# ERC20_ENABLED: 1
ERC20_ENABLED: 1
SIMAPP_ENABLED: 1
TENDERMINT_ENABLED: 1
SOCKETSERVER_ENABLED: 1
@@ -335,7 +335,7 @@ jobs:
- run:
environment:
WASMD_ENABLED: 1
# ERC20_ENABLED: 1
ERC20_ENABLED: 1
SIMAPP_ENABLED: 1
TENDERMINT_ENABLED: 1
SOCKETSERVER_ENABLED: 1
packages/cosmwasm/src/testutils.spec.ts
+6 -6
View File
@@ -81,13 +81,13 @@ export const deployedHackatom = {
/** Deployed as part of scripts/wasmd/init.sh */
export const deployedErc20 = {
codeId: 2,
source: "https://crates.io/api/v1/crates/cw-erc20/not-yet-released/download",
builder: "cosmwasm/rust-optimizer:0.9.0",
checksum: "0f14abcc6fed08f2dd06896db974989db97dbcc6e8e30188b73fe5ab427c7785",
source: "https://crates.io/api/v1/crates/cw-erc20/0.7.0/download",
builder: "cosmwasm/rust-optimizer:0.10.4",
checksum: "d04368320ad55089384adb171aaea39e43d710d7608829adba0300ed30aa2988",
instances: [
"cosmos18vd8fpwxzck93qlwghaj6arh4p7c5n89uzcee5", // HASH
"cosmos1hqrdl6wstt8qzshwc6mrumpjk9338k0lr4dqxd", // ISA
"cosmos18r5szma8hm93pvx6lwpjwyxruw27e0k5uw835c", // JADE
"cosmos1vjecguu37pmd577339wrdp208ddzymkudc46zj", // HASH
"cosmos1ym5m5dw7pttft5w430nxx6uat8f84ck4algmhg", // ISA
"cosmos1gv07846a3867ezn3uqkk082c5ftke7hpllcu8q", // JADE
],
};
scripts/wasmd/contracts/checksums.sha256
+1 -1
View File
@@ -1,3 +1,3 @@
0f14abcc6fed08f2dd06896db974989db97dbcc6e8e30188b73fe5ab427c7785 cw-erc20.wasm
ebc2b11e2afa50d5dcd4234840cd581e948a59d888bb8d651598bba3732cd8ee cw-nameservice.wasm
d04368320ad55089384adb171aaea39e43d710d7608829adba0300ed30aa2988 cw_erc20.wasm
3defc33a41f58c71d38b176d521c411d8e74d26403fde7660486930c7579a016 hackatom.wasm
scripts/wasmd/contracts/cw-erc20.wasm
LFS
BIN
View File
Binary file not shown.
scripts/wasmd/contracts/cw_erc20.wasm
LFS
BIN
View File
Binary file not shown.
scripts/wasmd/deploy_erc20.js
+3 -3
View File
@@ -22,8 +22,8 @@ const guest = {
};
const codeMeta = {
source: "https://crates.io/api/v1/crates/cw-erc20/not-yet-released/download",
builder: "cosmwasm/rust-optimizer:0.9.0",
source: "https://crates.io/api/v1/crates/cw-erc20/0.7.0/download",
builder: "cosmwasm/rust-optimizer:0.10.4",
};
const initDataHash = {
@@ -137,7 +137,7 @@ async function main() {
const wallet = await Secp256k1HdWallet.fromMnemonic(alice.mnemonic);
const client = new SigningCosmWasmClient(httpUrl, alice.address0, wallet);
const wasm = fs.readFileSync(__dirname + "/contracts/cw-erc20.wasm");
const wasm = fs.readFileSync(__dirname + "/contracts/cw_erc20.wasm");
const uploadReceipt = await client.upload(wasm, codeMeta, "Upload ERC20 contract");
console.info(`Upload succeeded. Receipt: ${JSON.stringify(uploadReceipt)}`);
scripts/wasmd/init.sh
+1 -1
View File
@@ -25,5 +25,5 @@ SCRIPT_DIR="$(realpath "$(dirname "$0")")"
sha256sum --check checksums.sha256
)
"$SCRIPT_DIR/deploy_hackatom.js"
# "$SCRIPT_DIR/deploy_erc20.js"
"$SCRIPT_DIR/deploy_erc20.js"
# "$SCRIPT_DIR/deploy_nameservice.js"
scripts/wasmd/start.sh
+1 -1
View File
@@ -37,7 +37,7 @@ echo "wasmd running and logging into $WASMD_LOGFILE"
# sleep 3 && cat "$WASMD_LOGFILE"
# Use a large timeout because of potentially long image download in `docker run`
if ! timeout 180 bash -c "until docker inspect -f '{{.State.Running}}' '$CONTAINER_NAME' &> /dev/null; do sleep 0.5; done"; then
if ! timeout 180 bash -c "until [ \"\$( docker container inspect -f '{{.State.Status}}' \"$CONTAINER_NAME\" 2> /dev/null )\" = \"running\" ]; do sleep 0.5; done"; then
echo "Container named '$CONTAINER_NAME' not running. We cannot continue." \
"This can happen when 'docker run' needs too long to download and start." \
"It might be worth retrying this step once the image is in the local docker cache."