diff --git a/.github/workflows/scarb.yml b/.github/workflows/scarb.yml new file mode 100644 index 0000000..8dd7c10 --- /dev/null +++ b/.github/workflows/scarb.yml @@ -0,0 +1,14 @@ +name: Scarb Test +on: + push: + pull_request: +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: software-mansion/setup-scarb@v1 + with: + scarb-version: "0.5.1" + - run: scarb fmt --check + - run: scarb test diff --git a/scripts/src/approve.rs b/scripts/src/approve.rs index d96aa73..177606d 100644 --- a/scripts/src/approve.rs +++ b/scripts/src/approve.rs @@ -23,17 +23,17 @@ pub async fn approve() -> Result<()> { let chain_id = provider.chain_id().await.unwrap(); let dai_address = FieldElement::from_hex_be( - "0x03e85bfbb8e2a42b7bead9e88e9a1b19dbccf661471061807292120462396ec9", + "0x00da114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3", ) .unwrap(); let usdc_address = FieldElement::from_hex_be( - "0x005a643907b9a4bc6a55e9069c4fd5fd1f5c79a22470690f75556c4736e34426", + "0x053c91253bc9682c04929ca02ed00b3e423f6710d2ee7e0d5ebb06f3ecf368a8", ) .unwrap(); - let remover_address = FieldElement::from_hex_be( - "0x0134774cc62dd610ac2280730561e1462868c558c1e6ce56b046358a8610c7ef", + let sender_address = FieldElement::from_hex_be( + "0x02058f6050454efcde895decc689bc9458571091f5314b45b9aa123a9f00eb4a", ) .unwrap(); @@ -55,7 +55,7 @@ pub async fn approve() -> Result<()> { to: dai_address, selector: get_selector_from_name("approve").unwrap(), calldata: vec![ - remover_address, + sender_address, FieldElement::from_hex_be("0xffffffffffffffffffffffffffffffff").unwrap(), FieldElement::from_hex_be("0xffffffffffffffffffffffffffffffff").unwrap(), ], @@ -65,7 +65,7 @@ pub async fn approve() -> Result<()> { to: usdc_address, selector: get_selector_from_name("approve").unwrap(), calldata: vec![ - remover_address, + sender_address, FieldElement::from_hex_be("0xffffffffffffffffffffffffffffffff").unwrap(), FieldElement::from_hex_be("0xffffffffffffffffffffffffffffffff").unwrap(), ], @@ -73,6 +73,7 @@ pub async fn approve() -> Result<()> { let result = account .execute(vec![approve_dai_call, approve_usdc_call]) + .fee_estimate_multiplier(3.0) .send() .await .unwrap(); diff --git a/scripts/src/multisend.rs b/scripts/src/multisend.rs index 2ddd9c8..b272f8f 100644 --- a/scripts/src/multisend.rs +++ b/scripts/src/multisend.rs @@ -23,7 +23,7 @@ pub async fn multisend() -> Result<()> { let chain_id = provider.chain_id().await.unwrap(); let dai_address = FieldElement::from_hex_be( - "0x03e85bfbb8e2a42b7bead9e88e9a1b19dbccf661471061807292120462396ec9", + "0x00da114221cb83fa859dbdb4c44beeaa0bb37c7537ad5ae66fe5e0efd20e6eb3", ) .unwrap(); @@ -33,7 +33,7 @@ pub async fn multisend() -> Result<()> { // .unwrap(); let token_sender_address = FieldElement::from_hex_be( - "0x0134774cc62dd610ac2280730561e1462868c558c1e6ce56b046358a8610c7ef", + "0x02058f6050454efcde895decc689bc9458571091f5314b45b9aa123a9f00eb4a", ) .unwrap(); diff --git a/src/tests/test_erc20.cairo b/src/tests/test_erc20.cairo index 5c5f5d3..d40f899 100644 --- a/src/tests/test_erc20.cairo +++ b/src/tests/test_erc20.cairo @@ -115,7 +115,7 @@ mod erc20_test { @starknet::Event::deserialize(ref keys, ref data).unwrap(), @Event::Transfer(Transfer { from: account, to: recipient, value: amount }), 'event == Transfer' - ); + ); } fn get_timestamp() -> u64 {